summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-05 15:19:53 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-05 15:19:53 +0200
commita3fd1b528ee6338b67eef435be3595d4a60bfd12 (patch)
tree367c7c0149d245ed3d21508c46c30d2dc951c721
parent0bf04ea43b914ea526b2b3217bbf13c96b705110 (diff)
downloadjenkins.debian.net-a3fd1b528ee6338b67eef435be3595d4a60bfd12.tar.xz
serve userContent directly from apache2, to get correct filetypes
-rw-r--r--etc/apache2/sites-available/jenkins.debian.net9
1 files changed, 9 insertions, 0 deletions
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net
index dcc95639..d77603f5 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/etc/apache2/sites-available/jenkins.debian.net
@@ -68,6 +68,14 @@ NameVirtualHost *:443
allow from all
</Directory>
+ Alias /userContent /var/lib/jenkins/userContent
+ <Directory /var/lib/jenkins/userContent>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+
ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
<Directory "/usr/lib/cgi-bin">
AllowOverride None
@@ -99,6 +107,7 @@ NameVirtualHost *:443
ProxyPass /robots.txt http://localhost:8080/userContent/robots.txt
# map /d-i-preseed-cfgs to /UserContent/d-i-preseed-cfgs
ProxyPass /d-i-preseed-cfgs/ http://localhost:8080/userContent/d-i-preseed-cfgs/
+ ProxyPass /userContent !
ProxyPass / http://localhost:8080/