[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: WIP for s#testing#stretch#g - also prepare apache redirects, though without new redirects for testing -> stretch, but I think thats good enough

[Holger Levsen]

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

holger pushed a commit to branch h01ger/rename-testing-to-stretch-before-stretch-is-stable
in repository jenkins.debian.net.

commit 0260f0a558ba20ed51143f837dc5c4bcf03ddaa6
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jun 12 23:06:00 2017 +0200

    reproducible Debian: WIP for s#testing#stretch#g - also prepare apache redirects, though without new redirects for testing -> stretch, but I think thats good enough
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 TODO4stretch_rename.txt                                    |  2 +-
 .../etc/apache2/sites-available/jenkins.debian.net.conf    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TODO4stretch_rename.txt b/TODO4stretch_rename.txt
index 1f081de..291577c 100644
--- a/TODO4stretch_rename.txt
+++ b/TODO4stretch_rename.txt
@@ -23,7 +23,7 @@ remove all jobs which match reproducible*testing*
 
 changes not yet prepared in git
 -------------------------------
-hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf s#testing#stretch# and modify
+hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf has no (new) redirects from testing to stretch, I think that's good enough
 db changes…
 prepare to add buster on 2017-06-17
 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 80fd7ce..94c9d51 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -197,7 +197,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|testing|unstable|experimental|history|rb-pg|notes|issues|rbuild|logs|dbd|dbdtxt|index_.*\.html|stats_.*\.png|reproducible.*\.json).*$
+	RewriteCond %{REQUEST_URI} ^/(static|stretch|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
@@ -238,7 +238,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|testing|experimental)/([a-z0-9]+)/([a-z0-9.+-]+) /debian/rb-pkg/$2/$3/$4.html [R=302,L]
+	RewriteRule ^/(debian/|)(unstable|stretch|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
@@ -275,16 +275,16 @@ 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 (/testing|unstable|/experimental) to (/testing|/unstable|/experimental)/index_suite_amd64_stats.html
+	# redirect (/stretch|unstable|/experimental) to (/stretch|/unstable|/experimental)/index_suite_amd64_stats.html
 	# note: the missing slash in the RewriteRule is wanted to avoid a double slash
-	RewriteCond %{REQUEST_URI} ^/(debian/|)(testing|unstable|experimental)(/|)$
+	RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|unstable|experimental)(/|)$
 	RewriteRule ^/(debian/|)(.*) /debian/$2/index_suite_amd64_stats.html [R,L]
 
-	# redirect (/testing|unstable|/experimental)/(amd64|arm64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|arm64|armhf|i386)_stats.html
-	RewriteCond %{REQUEST_URI} ^/(debian/|)(testing|unstable|experimental)/(amd64|arm64|armhf|i386)(/|)$
+	# 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)(/|)$
 	RewriteRule ^/(debian/|)([a-z0-9]+)/([a-z0-9]+) /debian/$2/index_suite_$3_stats.html [R,L]
 
-	# redirect (/(amd64|arm64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|arm64|armhf|i386)_stats.html
+	# redirect (/(amd64|arm64|armhf|i386) to (/stretch|/unstable|/experimental)/index_suite_(amd64|arm64|armhf|i386)_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