From d1bae288f5cd487005b629fef7952f5d87ce6605 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 22 Sep 2019 13:35:07 +0200 Subject: [PATCH] As debian.mirrors.d.o gets checked by the health checker, explicitly listen on localhost --- modules/roles/manifests/debian_mirror.pp | 2 +- modules/roles/templates/apache-ftp.debian.org.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp index de9e624ff..7cf72547b 100644 --- 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 b44eec3df..8f942ec99 100644 --- 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 ## -> + 127.0.0.1:80 [::1]:80 > ServerAdmin debian-admin@debian.org ServerName ftp.debian.org ServerAlias debian.anycast-test.mirrors.debian.org -- 2.20.1