[Qa-jenkins-scm] [jenkins.debian.net] 03/03: further apache2 rewrite cleanup

[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 99b7a0b51098595b2c3bf019260054576397e856
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Jan 20 15:23:04 2016 +0100

    further apache2 rewrite cleanup
---
 .../etc/apache2/sites-available/jenkins.debian.net.conf | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 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 4f4ba69..595157d 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -321,9 +321,15 @@ Use common-debian-service-https-redirect reproducible-builds.org
 	RewriteRule ^/(.*) /archlinux/archlinux.html [R,L]
 
 	# redirect /issues/ to /index_issues.html
+	RewriteCond %{HTTP_HOST} reproducible\.debian\.net
 	RewriteCond %{REQUEST_URI} ^/issues(/|)$
 	RewriteRule ^/(.*) /index_issues.html [R,L]
 
+	# redirect /fedora properly…
+	RewriteCond %{HTTP_HOST} reproducible\.debian\.net
+	RewriteCond %{REQUEST_URI} ^/fedora(/|)$
+	RewriteRule ^/?(.*) /rpms/fedora-23.html [R,L]
+
 	<Proxy *>
 		Require all granted
 	</Proxy>
@@ -486,19 +492,20 @@ Use common-debian-service-https-redirect reproducible-builds.org
 	RewriteCond %{REQUEST_URI} ^/archlinux(/|)$
 	RewriteRule ^/(.*) /archlinux/archlinux.html [R,L]
 
+	# redirect /fedora/ properly…
+	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
+	RewriteCond %{REQUEST_URI} ^/fedora(/|)$
+	RewriteRule ^/?(.*) /rpms/fedora-23.html [R,L]
+
 	# redirect /issues/ to /index_issues.html
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
 	RewriteCond %{REQUEST_URI} ^/issues(/|)$
 	RewriteRule ^/(.*) /index_issues.html [R,L]
 
-	# temporary redirects until the html is rewritten
+	# temporary redirect until the html is rewritten
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
 	RewriteCond %{REQUEST_URI} ^/debian(/|)$
 	RewriteRule ^/?(.*) /reproducible.html [R,L]
-	# and another:
-	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} ^/fedora(/|)$
-	RewriteRule ^/?(.*) /rpms/fedora-23.html [R,L]
 
 	<Proxy *>
 		Require all granted

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