summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-01-20 15:23:04 +0100
committerHolger Levsen <holger@layer-acht.org>2016-01-20 15:23:04 +0100
commit99b7a0b51098595b2c3bf019260054576397e856 (patch)
tree9cd1758277cb7a34b78e4f3eff85de65e9dadd16
parentb5f5cf1b4b4d9633e0cd95256173a89bcc51753b (diff)
downloadjenkins.debian.net-99b7a0b51098595b2c3bf019260054576397e856.tar.xz
further apache2 rewrite cleanup
-rw-r--r--hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf17
1 files 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 4f4ba696..595157df 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