X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=e53f7e4c71d8b0446783804b28a30bd96878f5b6;hb=fe07db9aa98761d38322f99e9f696cbe47a1c9f3;hp=c4ccc91ba7756971e6b3647d689762a457e7c15c;hpb=fba81eb4a038c11fe783d3b06ace198721844724;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index c4ccc91ba..e53f7e4c7 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -7,8 +7,29 @@ lookup_options:
   apt::sources::debian::location:
     merge: unique
 
+# class parameters
 resolv::nameservers: []
 resolv::searchpaths: ['debian.org']
+staticsync::user: 'staticsync'
+staticsync::basedir: '/srv/static.debian.org'
+
+roles::dns_primary::allow_access:
+  # easydns
+  - '64.68.200.91'
+  - '205.210.42.80'
+  # rcode0
+  - '83.136.34.0/27'
+  - '2a02:850:8::/47'
+  # netnod
+  - '192.71.80.0/24'
+  - '192.36.144.222'
+  - '192.36.144.218'
+  - '194.146.105.24'
+  - '194.146.105.25'
+  - '2a01:3f0:0:27::24'
+  - '2a01:3f0:0:28::25'
+
+# other variables
 allow_dns_query: []
 role_config__mirrors:
   mirror_basedir_prefix: '/srv/mirrors/'
@@ -27,44 +48,28 @@ paths:
   auto_clientcerts_dir: '/srv/puppet.debian.org/ca/RESULT/clientcerts'
 apt::sources::debian::location: 'https://deb.debian.org/debian/'
 
-staticsync::user: 'staticsync'
-staticsync::basedir: '/srv/static.debian.org'
 
 # all of these should be retired in favour of including the class role
 # with the host. weasel, 2019-09
 roles:
-  bugsmx:
-    - buxtehude.debian.org
-  dns_primary:
-    - denis.debian.org
-  dns_geo:
-    - geo1.debian.org
-    - geo2.debian.org
-    - geo3.debian.org
-  extranrpeclient:
-    - denis.debian.org
   ftp_master:
+    # XXX - used by ferm templates/defs.conf.erb
     - fasolo.debian.org
   mailrelay:
+    # XXX - ONLY used by ferm templates/defs.conf.erb
     - mailly.debian.org
     - muffat.debian.org
-  mirrormaster:
-    - melartin.debian.org
   muninmaster:
+    # XXX - used by ferm templates/defs.conf.erb
     - menotti.debian.org
   nagiosmaster:
+    # XXX - used by ferm templates/defs.conf.erb
     - tchaikovsky.debian.org
-  packagesmaster:
-    - picconi.debian.org
-  packagesqamaster:
-    - quantz.debian.org
-  popcon:
-    - pinel.debian.org
-  rtmaster:
-    - reger.debian.org
   security_master:
+    # XXX - used by ferm templates/defs.conf.erb
     - seger.debian.org
   security_mirror:
+    # XXX used also in ferm me.conf.erb
     mirror-anu.debian.org:
       fastly-backend: false
     mirror-csail.debian.org:
@@ -99,30 +104,18 @@ roles:
     wieck.debian.org:
       service-hostname: wieck.security.backend.mirrors.debian.org
       fastly-backend: true
-  static_mirror_onion:
-    - klecker.debian.org
-    - mirror-isc.debian.org
-    - senfter.debian.org
-  syncproxy:
-    - gretchaninov.debian.org
-    - klecker.debian.org
-    - milanollo.debian.org
-    - mirror-anu.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - schmelzer.debian.org
-    - smit.debian.org
   postgres_backup_server:
+    # XXX - used by ferm templates/defs.conf.erb
     - backuphost.debian.org
     - storace.debian.org
-  dabackup_client:
-    - lw03.debian.org
   debian_mirror:
+    # XXX used also in ferm me.conf.erb
     klecker.debian.org:
       listen-addresses:
         - '130.89.148.12:80'
         - '[2001:67c:2564:a119::148:12]:80'
       onion_v4_address: 130.89.148.12
+    new-klecker.debian.org: {}
     mirror-accumu.debian.org:
       service-hostname: accumu.debian.backend.mirrors.debian.org
       fastly-backend: true
@@ -141,13 +134,16 @@ roles:
       fastly-backend: true
       service-hostname: conova.debian.backend.mirrors.debian.org
   historical_master:
+    # XXX - used by ferm templates/defs.conf.erb
     - sibelius.debian.org
   historical_mirror:
+    # XXX used also in ferm me.conf.erb
     - gretchaninov.debian.org
     - klecker.debian.org
     - schmelzer.debian.org
     - sibelius.debian.org
   debug_mirror:
+    # XXX used also in ferm me.conf.erb
     mirror-accumu.debian.org:
       onion_v4_address: 130.242.6.199
       service-hostname: accumu.debug.backend.mirrors.debian.org
@@ -161,9 +157,8 @@ roles:
     - mirror-accumu.debian.org
     - schmelzer.debian.org
   ports_master:
+    # XXX - used by ferm templates/defs.conf.erb
     - porta.debian.org
-  onionbalance:
-    - olin.debian.org
   bgp:
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
@@ -175,13 +170,11 @@ roles:
     - fasolo.debian.org
     - lw07.debian.org
     - melartin.debian.org
+    - postgresql-manda-01.debian.org
     - sallinen.debian.org
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  snapshot_web:
-    - lw07.debian.org
-    - sallinen.debian.org
 
 classes:
   - base::includes