summaryrefslogtreecommitdiffstats
path: root/hosts/jenkins/etc/apache2
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-08-21 17:39:19 +0200
committerHolger Levsen <holger@layer-acht.org>2015-08-21 17:39:19 +0200
commitc51d60fcbd478ae77260357eb3c57efd4e61e7cf (patch)
treed5fe2bed7560b6e19d244b7eb697881f93d596bd /hosts/jenkins/etc/apache2
parent51da1828d559072c87ba589118060da082ed7d0d (diff)
downloadjenkins.debian.net-c51d60fcbd478ae77260357eb3c57efd4e61e7cf.tar.xz
reproducible: correctly use mod_rewrite to stop using javascript for the form
Diffstat (limited to 'hosts/jenkins/etc/apache2')
-rw-r--r--hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net7
1 files changed, 4 insertions, 3 deletions
diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
index 4345120c..ea377771 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
@@ -186,12 +186,13 @@ Use common-debian-service-https-redirect reproducible.debian.net
RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/$1.html -f
RewriteRule ^/([a-z0-9.+-]+) /rb-pkg/unstable/amd64/$1.html [R=302,L]
- # redirect rb.d.n/reproducible.html?SrcPkg=$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
+ # redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/$1.html -f
- RewriteRule ^/reproducible.html?SrcPkg=([a-z0-9.+-]+) /rb-pkg/unstable/amd64/$1.html [R=302,L]
+ RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$
+ RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/%2.html -f
+ RewriteRule ^/redirect /rb-pkg/unstable/amd64/%2.html? [R=302,L]
# redirect rb.d.n/$PKG → rb.d.n/rb-pkg/experimental/amd64/$PKG.html
# (this is the fallback for the previous redirect and should only catch packages which are only in experimental)