Move onion IP addresses into hiera

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 311cefc..1e96edb 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -259,13 +259,14 @@ roles:
         - '130.89.148.12:80'
         - '[2001:610:1908:b000::148:12]:80'
         - '[2001:67c:2564:a119::148:12]:80'
-      fastly-backend: false
+      onion_v4_address: 130.89.148.12
     mirror-bytemark.debian.org:
       service-hostname: bytemark.debian.backend.mirrors.debian.org
       listen-addresses:
         - '5.153.231.45:80'
         - '[2001:41c8:1000:21::21:45]:80'
       fastly-backend: true
+      onion_v4_address: 5.153.231.45
     mirror-accumu.debian.org:
       service-hostname: accumu.debian.backend.mirrors.debian.org
       fastly-backend: true
@@ -282,7 +283,7 @@ roles:
       listen-addresses:
         - '149.20.4.15:80'
         - '[2001:4f8:1:c::15]:80'
-      fastly-backend: false
+      onion_v4_address: 149.20.4.15
   debian_mirror_onion:
     - klecker.debian.org
     - mirror-bytemark.debian.org

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 2e22aaa..680eccd 100644 (file)
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -14,23 +14,15 @@ class roles::debian_mirror {
                        true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
                        default => '',
                }], ' ')
-       $onion_v4_addr = $::hostname ? {
-               mirror-bytemark => '5.153.231.45',
-               klecker    => '130.89.148.12',
-               mirror-isc => '149.20.4.15',
-               default    => undef,
-       }
 
        apache2::site { '010-ftp.debian.org':
                site   => 'ftp.debian.org',
                content => template('roles/apache-ftp.debian.org.erb'),
        }
 
-       if has_role('debian_mirror_onion') {
-               if ! $onion_v4_addr {
-                       fail("Do not have an onion_v4_addr set for $::hostname.")
-               }
-
+       $onion_v4_addr = hiera("roles.debian_mirror", {})
+               .dig($::fqdn, 'onion_v4_address')
+       if $onion_v4_addr {
                onion::service { 'ftp.debian.org':
                        port => 80,
                        target_port => 80,