[Qa-jenkins-scm] [jenkins.debian.net] 01/02: Revert "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 22add230c3a267bf5d1b8e8d5bd88c73009c68f9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 31 13:49:09 2015 -0600

    Revert "Setup reproducible-builds.org website"
    
    This reverts commit b32118218c89ad429ef26fa03ed16d55069728ac.
---
 .../jenkins/etc/apache2/sites-available/jenkins.debian.net | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
index 0776c7e..f321858 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
@@ -314,11 +314,17 @@ 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 /srv/reproducible-builds.org/www
+	DocumentRoot /var/lib/jenkins/userContent/reproducible
 	AddDefaultCharset utf-8
 
-	Alias /website.git /srv/reproducible-builds.org/git/website.git
-	Alias /specs /var/lib/jenkins/userContent/reproducible/specs
-	Alias /howto /var/lib/jenkins/userContent/reproducible/howto
+	# 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]
+
+	<Proxy *>
+		Require all granted
+	</Proxy>
 </VirtualHost>
 

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