diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2015-02-08 00:15:21 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-02-08 09:28:33 +0100 |
| commit | 29f32dc32db90e4cc07caa083fa565a9f03753af (patch) | |
| tree | 1137006b8fe03fd3d514c047fbca3dc8418584d8 | |
| parent | dfdb272c35bcd7128e5e6927ad34a07d2f1f77af (diff) | |
| download | jenkins.debian.net-29f32dc32db90e4cc07caa083fa565a9f03753af.tar.xz | |
apache: clean the config by using a macro
| -rw-r--r-- | etc/apache2/sites-available/jenkins.debian.net | 70 |
1 files changed, 20 insertions, 50 deletions
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net index 20bb3eb3..b9e0667c 100644 --- a/etc/apache2/sites-available/jenkins.debian.net +++ b/etc/apache2/sites-available/jenkins.debian.net @@ -1,59 +1,27 @@ NameVirtualHost *:80 NameVirtualHost *:443 -<VirtualHost 127.0.0.1:80> - ServerName 127.0.0.1 +<Macro localhost-directives $ipaddress> + <VirtualHost $ipaddress:80> + ServerName $ipaddress 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> - + <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> <Macro common-debian-service-https-redirect $name> <VirtualHost *:80> @@ -106,6 +74,8 @@ NameVirtualHost *:443 CustomLog ${APACHE_LOG_DIR}/access.log combined </Macro> +Use localhost-directives 127.0.0.1 +Use localhost-directives 10.0.2.1 Use common-debian-service-https-redirect jenkins.debian.net Use common-debian-service-https-redirect reproducible.debian.net |