summaryrefslogtreecommitdiffstats
path: root/hosts/jenkins
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2017-07-13 23:30:17 +0200
committerMattia Rizzolo <mattia@debian.org>2017-07-13 23:31:14 +0200
commit91ed877939c02c7bfbf3480868a480754df8ef46 (patch)
tree905a968a31ce528d380fc6e631c9086fdb3e0be5 /hosts/jenkins
parentdcdbf5856bd61810505f90dcbee5fdc12247e004 (diff)
downloadjenkins.debian.net-91ed877939c02c7bfbf3480868a480754df8ef46.tar.xz
apache: fixup redirects for t.r-b.o/debian/(testing|buster)
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
Diffstat (limited to 'hosts/jenkins')
-rw-r--r--hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
index 5f6c4f83..4a9684b5 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -271,16 +271,16 @@ Use common-debian-service-https-redirect www.reproducible-builds.org
# redirect /testing to /buster
# note: no flags on the rule, will cause apache to continue after rewriting
# the url and apply the next rule
- Rewritecond %{REQUEST_URI} ^/(debian/|)testing(/|)$
- RewriteRule ^/(debian/|)(.*) /debian/buster/
+ Rewritecond %{REQUEST_URI} ^/debian/testing
+ RewriteRule ^/debian/testing/(.*) /debian/buster/$1
# redirect /$suite to /$suite/index_suite_amd64_stats.html
# note: the missing slash in the RewriteRule is wanted to avoid a double slash
- RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|unstable|experimental)(/|)$
+ RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|unstable|experimental)(/|)$
RewriteRule ^/(debian/|)(.*) /debian/$2/index_suite_amd64_stats.html [R,L]
# redirect /$suite/$arch to $suite/index_suite_$arch_stats.html
- RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|testing|unstable|experimental)/(amd64|arm64|armhf|i386)(/|)$
+ RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|unstable|experimental)/(amd64|arm64|armhf|i386)(/|)$
RewriteRule ^/(debian/|)([a-z0-9]+)/([a-z0-9]+) /debian/$2/index_suite_$3_stats.html [R,L]
# redirect /$arch to /unstable/index_suite_$arch_stats.html