[Qa-jenkins-scm] [jenkins.debian.net] 01/01: apache: fixup redirects for t.r-b.o/debian/(testing|buster)

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository jenkins.debian.net.

commit 91ed877939c02c7bfbf3480868a480754df8ef46
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Jul 13 23:30:17 2017 +0200

    apache: fixup redirects for t.r-b.o/debian/(testing|buster)
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf | 8 ++++----
 1 file 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 5f6c4f8..4a9684b 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git