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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 2b06049a6..95d7e8859 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -34,41 +34,49 @@ staticsync::basedir: '/srv/static.debian.org'
 # 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
   ftp_master:
+    # XXX - used by ferm templates/defs.conf.erb
     - fasolo.debian.org
-  git_master:
-    - adayevskaya.debian.org
   mailrelay:
+    # XXX - used by ferm templates/defs.conf.erb
     - mailly.debian.org
     - muffat.debian.org
   mirrormaster:
+    # XXX - used by ferm templates/defs.conf.erb
     - 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:
+    # XXX - exim config flag only
     - picconi.debian.org
   packagesqamaster:
-    - quantz.debian.org
-  popcon:
-    - pinel.debian.org
-  qamaster:
+    # 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
   security_mirror:
+    # XXX used also in ferm me.conf.erb
     mirror-anu.debian.org:
       fastly-backend: false
     mirror-csail.debian.org:
@@ -103,28 +111,8 @@ roles:
     wieck.debian.org:
       service-hostname: wieck.security.backend.mirrors.debian.org
       fastly-backend: true
-  security_tracker:
-    - soriano.debian.org
-  security_upload:
-    - suchon.debian.org
-  sso:
-    - diabelli.debian.org
-  # single sign on relying party (host) - also required apache2 module enabled on that host via other means
-  sso_rp:
-    - debussy.debian.org
-    - diabelli.debian.org
-    - jerea.debian.org
-    - nono.debian.org
-    - quantz.debian.org
-    - tate.debian.org
-    - ticharich.debian.org
-    - wilder.debian.org
-    - wuiet.debian.org
-  static_mirror_onion:
-    - klecker.debian.org
-    - mirror-isc.debian.org
-    - senfter.debian.org
   syncproxy:
+    # XXX - used by ferm templates/defs.conf.erb
     - gretchaninov.debian.org
     - klecker.debian.org
     - milanollo.debian.org
@@ -133,16 +121,14 @@ roles:
     - mirror-umn.debian.org
     - schmelzer.debian.org
     - smit.debian.org
-  udd:
-    - ullmann.debian.org
-  wiki:
-    - wilder.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'
@@ -166,13 +152,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
@@ -185,22 +174,14 @@ roles:
   debug_mirror_onion:
     - mirror-accumu.debian.org
     - schmelzer.debian.org
-  i18n.d.o:
-    - tye.debian.org
-  l10n.d.o:
-    - tye.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
-  apache_prefork:
-    # php needs this
-    - quantz.debian.org
-    - tchaikovsky.debian.org
-    - wuiet.debian.org
   postgresql_server:
     # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org
@@ -213,18 +194,6 @@ roles:
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  apache_ratelimited:
-    - beach.debian.org
-    - buxtehude.debian.org
-    - lw07.debian.org
-    - picconi.debian.org
-    - pkgmirror-csail.debian.org
-    - sallinen.debian.org
-  snapshot_web:
-    - lw07.debian.org
-    - sallinen.debian.org
-  snapshot_shell:
-    - lw08.debian.org
 
 classes:
   - base::includes