summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-02-07 13:09:23 +0100
committerHolger Levsen <holger@layer-acht.org>2015-02-07 13:09:23 +0100
commit225d899572f626a6c6a9e1724af0b23c555e3f82 (patch)
treeaabad55fc4a2ffe451d8a8e663dcaa353c607bdc
parentdea177e5cc67d9084dc9d3330b01043423c2844d (diff)
downloadjenkins.debian.net-225d899572f626a6c6a9e1724af0b23c555e3f82.tar.xz
g-i: do not redirect to https if accessed as 127.0.0.1 or 10.0.2.1 - redudant but working configuration
-rw-r--r--etc/apache2/sites-available/jenkins.debian.net54
1 files changed, 54 insertions, 0 deletions
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net
index 60944dc5..736a1b59 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/etc/apache2/sites-available/jenkins.debian.net
@@ -1,6 +1,60 @@
NameVirtualHost *:80
NameVirtualHost *:443
+<VirtualHost 127.0.0.1:80>
+ ServerName 127.0.0.1
+ ServerAdmin holger@layer-acht.org
+ CustomLog /var/log/apache2/access.log combined
+ ErrorLog /var/log/apache2/error.log
+ <Directory /var/lib/jenkins/userContent>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ AddType text/plain .log
+ </Directory>
+ <Proxy *>
+ Order deny,allow
+ Allow from all
+ </Proxy>
+ ProxyPreserveHost on
+ AllowEncodedSlashes NoDecode
+ # proxy everything but a few urls
+ ProxyPass /server-status !
+ # 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/ nocanon
+ ProxyPassReverse / http://localhost:8080/
+</VirtualHost>
+<VirtualHost 10.0.2.1:80>
+ ServerName 10.0.2.1
+ ServerAdmin holger@layer-acht.org
+ CustomLog /var/log/apache2/access.log combined
+ ErrorLog /var/log/apache2/error.log
+ <Directory /var/lib/jenkins/userContent>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ AddType text/plain .log
+ </Directory>
+ <Proxy *>
+ Order deny,allow
+ Allow from all
+ </Proxy>
+ ProxyPreserveHost on
+ AllowEncodedSlashes NoDecode
+ # proxy everything but a few urls
+ ProxyPass /server-status !
+ # 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/ nocanon
+ ProxyPassReverse / http://localhost:8080/
+</VirtualHost>
+
+
<Macro common-debian-service-https-redirect $name>
<VirtualHost *:80>
ServerName $name