From 166fc78806fcd33db60bc476d6b5dc6d2a4634b0 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@mapreri.org>
Date: Fri, 9 Jan 2015 12:58:10 +0100
Subject: apache: remove heading /userContent/ from reproducible.d.n urls,
 rewriting them

---
 etc/apache2/sites-available/jenkins.debian.net | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'etc')

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 *>
-- 
cgit v1.2.3-70-g09d2