summaryrefslogtreecommitdiffstats
path: root/hosts
diff options
context:
space:
mode:
authorJérémy Bobbio <lunar@debian.org>2015-10-31 19:14:36 +0100
committerHolger Levsen <holger@layer-acht.org>2015-10-31 13:49:22 -0600
commitdea8ee940df2ffe3d52140341b415cf6eddb2d2f (patch)
tree71d14be5a43d2f71d5ed2f5454ad67186ccd17c9 /hosts
parent22add230c3a267bf5d1b8e8d5bd88c73009c68f9 (diff)
downloadjenkins.debian.net-dea8ee940df2ffe3d52140341b415cf6eddb2d2f.tar.xz
Setup reproducible-builds.org website
Diffstat (limited to 'hosts')
-rw-r--r--hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net21
1 files 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 f3218582..ddd50175 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>