[Qa-jenkins-scm] [jenkins.debian.net] 04/07: apache: t.r-b.o: redirect /testing/ to /stretch/

[Holger Levsen]

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

holger pushed a commit to branch testing2stretch
in repository jenkins.debian.net.

commit a588ff42b8df6fe7abcb8dcb25d760c45922fdc7
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Jun 15 18:55:24 2017 +0200

    apache: t.r-b.o: redirect /testing/ to /stretch/
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 TODO4stretch_rename.txt                                |  6 +-----
 .../apache2/sites-available/jenkins.debian.net.conf    | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/TODO4stretch_rename.txt b/TODO4stretch_rename.txt
index 5077083..ada4136 100644
--- a/TODO4stretch_rename.txt
+++ b/TODO4stretch_rename.txt
@@ -26,13 +26,9 @@ reenable job execution
 do run update_jdn.sh again
 remove all jobs which match reproducible*testing*
 
-changes not to be done
-----------------------
-hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf has no (new) redirects from testing to stretch, I think that's good enough
-
 changes not yet prepared in git
 -------------------------------
 db changes
 prepare to add buster on 2017-06-17
+(including changing the apache redirect testing→stretch to testing→buster)
 finally, remove this file again.
-
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 bb3aef9..eb2585a 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -190,7 +190,7 @@ Use common-debian-service-https-redirect www.reproducible-builds.org
 
 	# redirect debian specific requests from t.r-b.o/$URI → t.r-b.o/debian/$URI
 	RewriteCond /var/lib/jenkins/userContent/reproducible/debian/$1 -f
-	RewriteCond %{REQUEST_URI} ^/(static|stretch|unstable|experimental|history|rb-pg|notes|issues|rbuild|logs|dbd|dbdtxt|index_.*\.html|stats_.*\.png|reproducible.*\.json).*$
+	RewriteCond %{REQUEST_URI} ^/(static|stretch|testing|unstable|experimental|history|rb-pg|notes|issues|rbuild|logs|dbd|dbdtxt|index_.*\.html|stats_.*\.png|reproducible.*\.json).*$
 	RewriteRule ^/(.*) /debian/$1 [R=302,L]
 
 	# redirect t.r-b.o/issues/$ISSUE → t.r-b.o/issues/unstable/$ISSUE
@@ -231,7 +231,7 @@ Use common-debian-service-https-redirect www.reproducible-builds.org
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/$2/$3/$4.html -f
-	RewriteRule ^/(debian/|)(unstable|stretch|experimental)/([a-z0-9]+)/([a-z0-9.+-]+) /debian/rb-pkg/$2/$3/$4.html [R=302,L]
+	RewriteRule ^/(debian/|)(stretch|testing|unstable|experimental)/([a-z0-9]+)/([a-z0-9.+-]+) /debian/rb-pkg/$2/$3/$4.html [R=302,L]
 
 	# redirect t.r-b.o/rb-pkg/$PKG.html → t.r-b.o/rb-pkg/unstable/amd64/$PKG.html
 	RewriteCond %{REQUEST_FILENAME} !-f
@@ -268,16 +268,22 @@ Use common-debian-service-https-redirect www.reproducible-builds.org
 	RewriteCond %{REQUEST_URI} ^/(debian/|)index_all_abc.html$
 	RewriteRule ^/(debian/|)?(.+) /debian/unstable/amd64/$2 [R=301,L]
 
-	# redirect (/stretch|unstable|/experimental) to (/stretch|/unstable|/experimental)/index_suite_amd64_stats.html
+	# redirect /testing to /stretch
+	# 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/stretch/
+
+	# 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)(/|)$
 	RewriteRule ^/(debian/|)(.*) /debian/$2/index_suite_amd64_stats.html [R,L]
 
-	# redirect (/stretch|unstable|/experimental)/(amd64|arm64|armhf|i386) to (/stretch|/unstable|/experimental)/index_suite_(amd64|arm64|armhf|i386)_stats.html
-	RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|unstable|experimental)/(amd64|arm64|armhf|i386)(/|)$
+	# redirect /$suite/$arch to $suite/index_suite_$arch_stats.html
+	RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|testing|unstable|experimental)/(amd64|arm64|armhf|i386)(/|)$
 	RewriteRule ^/(debian/|)([a-z0-9]+)/([a-z0-9]+) /debian/$2/index_suite_$3_stats.html [R,L]
 
-	# redirect (/(amd64|arm64|armhf|i386) to (/stretch|/unstable|/experimental)/index_suite_(amd64|arm64|armhf|i386)_stats.html
+	# redirect /$arch to /unstable/index_suite_$arch_stats.html
 	RewriteCond %{REQUEST_URI} ^/(debian/|)(amd64|arm64|armhf|i386)(/|)$
 	RewriteRule ^/(debian/|)([a-z0-9]+) /debian/unstable/index_suite_$2_stats.html [R,L]
 

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