[Qa-jenkins-scm] [jenkins.debian.net] 02/02: Setup reproducible-builds.org website

[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 dea8ee940df2ffe3d52140341b415cf6eddb2d2f
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Oct 31 19:14:36 2015 +0100

    Setup reproducible-builds.org website
---
 .../etc/apache2/sites-available/jenkins.debian.net  | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
index f321858..ddd5017 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
@@ -314,17 +314,22 @@ Use common-debian-service-https-redirect reproducible-builds.org
 	Use common-directives reproducible-builds.org startcom.crt
 	SSLCertificateFile /etc/apache2/ssl/reproducible-builds.org.pem
 
-	DocumentRoot /var/lib/jenkins/userContent/reproducible
+	DocumentRoot /srv/reproducible-builds.org/www
 	AddDefaultCharset utf-8
 
-	# redirects reproducible-builds.org to https://reproducible.debian.net except for /specs/ and /howto/
-	RewriteCond %{HTTP_HOST} reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} !^/specs($|/)
-	RewriteCond %{REQUEST_URI} !^/howto($|/)
-	RewriteRule ^/?(.*) https://reproducible.debian.net/$1 [R=301,L]
+	Alias /website.git /srv/reproducible-builds.org/git/website.git
+	Alias /specs /var/lib/jenkins/userContent/reproducible/specs
 
-	<Proxy *>
+	RewriteRule on
+	RewriteRule /howto($|/.*) /docs/ [R=permanent]
+
+	<Directory /srv/reproducible-builds.org/www>
+		AllowOverride None
 		Require all granted
-	</Proxy>
+	</Directory>
+	<Directory /srv/reproducible-builds.org/git>
+		AllowOverride None
+		Require all granted
+	</Directory>
 </VirtualHost>
 

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