[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible debian: fix more links, edit more redirects

[Holger Levsen]

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

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

commit 51d6c1a9c9178e7489829dd3201e60ddbc1624bf
Author: Valerie R Young <spectranaut at riseup.net>
Date:   Fri Jun 10 13:09:28 2016 -0400

    reproducible debian: fix more links, edit more redirects
---
 bin/reproducible_common.sh                         |  4 ++--
 .../sites-available/jenkins.debian.net.conf        | 28 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index eaa7774..495682c 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -263,7 +263,7 @@ write_page_header() {
 				if [ "$1" = "suite_arch_stats" ] && [ "$i" = "$ARCH" ] ; then
 					CLASS=" class=\"active\""
 				fi
-				write_page " <a href=\"debian/$SUITE/index_suite_${i}_stats.html\"$CLASS>$i</a>  "
+				write_page " <a href=\"/debian/$SUITE/index_suite_${i}_stats.html\"$CLASS>$i</a>  "
 				CLASS=""
 			done
 			write_page "</li>"
@@ -273,7 +273,7 @@ write_page_header() {
 				if [ "$1" = "suite_arch_stats" ] && [ "$i" = "$SUITE" ] ; then
 					CLASS=" class=\"active\""
 				fi
-				write_page " <a href=\"debian/$i/index_suite_${ARCH}_stats.html\"$CLASS>$i</a>  "
+				write_page " <a href=\"/debian/$i/index_suite_${ARCH}_stats.html\"$CLASS>$i</a>  "
 				CLASS=""
 			done
 			write_page "</li>"
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 f2d95fd..4d44e3a 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -440,32 +440,32 @@ Use common-debian-service-https-redirect reproducible-builds.org
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteCond %{REQUEST_URI} ^/index_reproducible.html$ [or]
-	RewriteCond %{REQUEST_URI} ^/index_FTBR.html$ [or]
-	RewriteCond %{REQUEST_URI} ^/index_FTBFS.html$ [or]
-	RewriteCond %{REQUEST_URI} ^/index_depwait.html$ [or]
-	RewriteCond %{REQUEST_URI} ^/index_404.html$ [or]
-	RewriteCond %{REQUEST_URI} ^/index_not_for_us.html$ [or]
-	RewriteCond %{REQUEST_URI} ^/index_blacklisted.html$ [or]
-	RewriteCond %{REQUEST_URI} ^/index_last_24h.html$ [or]
-	RewriteCond %{REQUEST_URI} ^/index_last_48h.html$ [or]
-	RewriteCond %{REQUEST_URI} ^/index_all_abc.html$
+	RewriteCond %{REQUEST_URI} ^/(debian/|)index_reproducible.html$ [or]
+	RewriteCond %{REQUEST_URI} ^/(debian/|)index_FTBR.html$ [or]
+	RewriteCond %{REQUEST_URI} ^/(debian/|)index_FTBFS.html$ [or]
+	RewriteCond %{REQUEST_URI} ^/(debian/|)index_depwait.html$ [or]
+	RewriteCond %{REQUEST_URI} ^/(debian/|)index_404.html$ [or]
+	RewriteCond %{REQUEST_URI} ^/(debian/|)index_not_for_us.html$ [or]
+	RewriteCond %{REQUEST_URI} ^/(debian/|)index_blacklisted.html$ [or]
+	RewriteCond %{REQUEST_URI} ^/(debian/|)index_last_24h.html$ [or]
+	RewriteCond %{REQUEST_URI} ^/(debian/|)index_last_48h.html$ [or]
+	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
 	# note: the missing slash in the RewriteRule is wanted to avoid a double slash
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)(/|)$
+	RewriteCond %{REQUEST_URI} ^/(debian/|)(testing|unstable|experimental)(/|)$
 	RewriteRule ^/(debian/|)(.*) /debian/$2/index_suite_amd64_stats.html [R,L]
 
 	# redirect (/testing|unstable|/experimental)/(amd64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf|i386)_stats.html
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf|i386)(/|)$
+	RewriteCond %{REQUEST_URI} ^/(debian/|)(testing|unstable|experimental)/(amd64|armhf|i386)(/|)$
 	RewriteRule ^/(debian/|)([a-z0-9]+)/([a-z0-9]+) /debian/$2/index_suite_$3_stats.html [R,L]
 
 	# redirect (/(amd64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf|i386)_stats.html
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} ^/(amd64|armhf|i386)(/|)$
+	RewriteCond %{REQUEST_URI} ^/(debian/|)(amd64|armhf|i386)(/|)$
 	RewriteRule ^/(debian/|)([a-z0-9]+) /debian/unstable/index_suite_$2_stats.html [R,L]
 
 	# redirect /coreboot/ to coreboot/coreboot.html
@@ -505,7 +505,7 @@ Use common-debian-service-https-redirect reproducible-builds.org
 
 	# redirect /issues/ to /index_issues.html
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} ^/issues(/|)$
+	RewriteCond %{REQUEST_URI} ^/(debian/|)issues(/|)$
 	RewriteRule ^/(debian/|)(.*) /debian/index_issues.html [R,L]
 
 	# temporary redirect until the html is rewritten

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