As debian.mirrors.d.o gets checked by the health checker, explicitly listen on localhost

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index de9e624..7cf7254 100644 (file)
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -5,7 +5,7 @@ class roles::debian_mirror {
   $archive_root = "${mirror_basedir_prefix}debian"
   $listen_addresses = hiera('roles.debian_mirror')
     .dig($::fqdn, 'listen-addresses')
-    .then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] }
+    .then |$a| { $a }
     .lest || { ['*:80'] }
 
   $vhost_listen = join([

diff --git a/modules/roles/templates/apache-ftp.debian.org.erb b/modules/roles/templates/apache-ftp.debian.org.erb
index b44eec3..8f942ec 100644 (file)
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -3,7 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost <%= @vhost_listen %>>
+<VirtualHost <%= @vhost_listen %> 127.0.0.1:80 [::1]:80 >
        ServerAdmin debian-admin@debian.org
        ServerName ftp.debian.org
        ServerAlias debian.anycast-test.mirrors.debian.org