X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=e3afd7966f19f090e779b485a20fdf30d6d8792e;hb=4b78dc516ce80bf4a76c2851a6d9d1962d1f7084;hp=95d7e885942f7b23cb3f8c4698085ad4ac3d6d39;hpb=759290ddcbb787c862aed8df582819d684ce8221;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 95d7e8859..e3afd7966 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,23 +48,10 @@ 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:
-    # XXX - exim config flag only
-    - buxtehude.debian.org
-  dns_primary:
-    # XXX - used by ferm templates/defs.conf.erb
-    - denis.debian.org
-  dns_geo:
-    # XXX - used by ferm templates/defs.conf.erb
-    - geo1.debian.org
-    - geo2.debian.org
-    - geo3.debian.org
   extranrpeclient:
     # XXX - used by ferm templates/defs.conf.erb
     - denis.debian.org
@@ -51,7 +59,7 @@ roles:
     # XXX - used by ferm templates/defs.conf.erb
     - fasolo.debian.org
   mailrelay:
-    # XXX - used by ferm templates/defs.conf.erb
+    # XXX - ONLY used by ferm templates/defs.conf.erb
     - mailly.debian.org
     - muffat.debian.org
   mirrormaster:
@@ -63,15 +71,6 @@ roles:
   nagiosmaster:
     # XXX - used by ferm templates/defs.conf.erb
     - tchaikovsky.debian.org
-  packagesmaster:
-    # XXX - exim config flag only
-    - picconi.debian.org
-  packagesqamaster:
-    # XXX - exim config flag
-    - quantz.debian.org
-  rtmaster:
-    # XXX - exim config flag
-    - reger.debian.org
   security_master:
     # XXX - used by ferm templates/defs.conf.erb
     - seger.debian.org