Add antiharassment to callout_users, grey_users, rbllist, and rhsbllist

[mirror/dsa-puppet.git] / modules / roles / manifests / debian_mirror.pp

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index edf30a1..f6e5696 100644 (file)
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -1,13 +1,20 @@
 class roles::debian_mirror {
        include roles::archvsync_base
 
-       $vhost_listen = $::hostname ? {
-               klecker    => '130.89.148.12:80 2001:610:1908:b000::148:12:80',
-               mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
-               default => '*:80',
-       }
+       $vhost_listen = join([
+               $::hostname ? {
+                       klecker    => '130.89.148.12:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80',
+                       mirror-bytemark => '5.153.231.45:80 [2001:41c8:1000:21::21:45]:80',
+                       mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
+                       mirror-conova => '217.196.149.232:80 [2a02:16a8:dc41:100::232]:80',
+                       default => '*:80',
+               },
+               has_role('bgp') ? {
+                       true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
+                       default => '',
+               }], ' ')
        $onion_v4_addr = $::hostname ? {
-               bilbao     => '5.153.231.37',
+               mirror-bytemark => '5.153.231.45',
                klecker    => '130.89.148.12',
                mirror-isc => '149.20.4.15',
                default    => undef,