summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-01-09 12:58:10 +0100
committerHolger Levsen <holger@layer-acht.org>2015-01-09 12:58:45 +0100
commit166fc78806fcd33db60bc476d6b5dc6d2a4634b0 (patch)
tree7361a31933410e7f7913dde522e0227e2628e3dd
parent6ed3dcbd2036c06e585eaef8063ab982b0335dcc (diff)
downloadjenkins.debian.net-166fc78806fcd33db60bc476d6b5dc6d2a4634b0.tar.xz
apache: remove heading /userContent/ from reproducible.d.n urls, rewriting them
-rw-r--r--etc/apache2/sites-available/jenkins.debian.net13
1 files changed, 12 insertions, 1 deletions
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net
index fe2fd6e7..4c5cabad 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/etc/apache2/sites-available/jenkins.debian.net
@@ -69,6 +69,7 @@ NameVirtualHost *:443
AllowOverride None
Order allow,deny
allow from all
+ AddType text/plain .log
</Directory>
Alias /userContent /var/lib/jenkins/userContent
@@ -104,7 +105,17 @@ NameVirtualHost *:443
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_URI} ^/$ [or]
RewriteCond %{REQUEST_URI} ^/userContent/$
- RewriteRule ^/(.*) https://%{HTTP_HOST}/userContent/reproducible.html [R]
+ RewriteRule ^/(.*) /reproducible.html [R,L]
+
+ RewriteCond %{HTTP_HOST} reproducible\.debian\.net
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteCond %{REQUEST_URI} !^/userContent
+ RewriteRule ^(.*)$ /userContent/$1 [L]
+
+ RewriteCond %{HTTP_HOST} reproducible\.debian\.net
+ RewriteCond %{REQUEST_URI} ^/userContent
+ RewriteRule ^/userContent/(.*)$ /$1 [R]
ProxyRequests Off
<Proxy *>