[Qa-jenkins-scm] [jenkins.debian.net] 01/08: apache: localhost has de-facto the same configurations of the more wide virtualhost (minus the https redirect), drop it.

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository jenkins.debian.net.

commit d80031fbfb4f8d9a9d1cd5275ce202a8041ad0c1
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Apr 6 15:40:10 2018 +0200

    apache: localhost has de-facto the same configurations of the more wide virtualhost (minus the https redirect), drop it.
    
    if anything breaks, please move it to use a fqdn https://jenkins.d.n
    instead.
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 .../sites-available/jenkins.debian.net.conf        | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
index 8b9f3f8..282e4fe 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -1,25 +1,3 @@
-<Macro localhost-directives $ipaddress>
-	<VirtualHost $ipaddress:80>
-		ServerName $ipaddress
-		ServerAdmin holger at layer-acht.org
-		CustomLog /var/log/apache2/access.log combined
-		ErrorLog /var/log/apache2/error.log
-		<Proxy *>
-			Require all granted
-		</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 /cli !
-		ProxyPass / http://localhost:8080/ nocanon
-		ProxyPassReverse  / http://localhost:8080/
-	</VirtualHost>
-</Macro>
-
 <Macro common-debian-service-https-redirect $name>
 	<VirtualHost *:80>
 		ServerName $name
@@ -85,9 +63,6 @@
 	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
 Use common-debian-service-https-redirect tests.reproducible-builds.org

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