make manziarly a static master

[mirror/dsa-puppet.git] / hieradata / common.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e78f982..cd8aca4 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -1,7 +1,14 @@
 ---
-nameservers: []
-searchpaths: []
-resolvoptions: []
+
+lookup_options:
+  # with merge: unique entries in other hiera sources add to the array
+  resolv::searchpaths:
+    merge: unique
+  apt::sources::debian::location:
+    merge: unique
+
+resolv::resolv::nameservers: []
+resolv::searchpaths: ['debian.org']
 allow_dns_query: []
 role_config__mirrors:
   mirror_basedir_prefix: '/srv/mirrors/'
@@ -18,6 +25,10 @@ paths:
   letsencrypt_dir: '/srv/puppet.debian.org/from-letsencrypt'
   auto_certs_dir: '/srv/puppet.debian.org/ca/RESULT/certs'
   auto_clientcerts_dir: '/srv/puppet.debian.org/ca/RESULT/clientcerts'
+apt::sources::debian::location: 'https://deb.debian.org/debian/'
+
+# all of these should be retired in favour of including the class role
+# with the host. weasel, 2019-09
 roles:
   bugsmx:
     - buxtehude.debian.org
@@ -28,8 +39,6 @@ roles:
   bugs_base:
     - buxtehude.debian.org
     - beach.debian.org
-  buildd_master:
-    - wuiet.debian.org
   contributors:
     - nono.debian.org
   dbmaster:
@@ -59,8 +68,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  jenkins:
-    - jerea.debian.org
   keyring:
     - kaufmann.debian.org
   lists:
@@ -98,8 +105,6 @@ roles:
   pubsub:
     - rainier.debian.org
     - rapoport.debian.org
-  puppetmaster:
-    - handel.debian.org
   qamaster:
     - quantz.debian.org
   rtmaster:
@@ -118,10 +123,6 @@ roles:
   security_mirror:
     mirror-anu.debian.org:
       fastly-backend: false
-    mirror-bytemark.debian.org:
-      fastly-backend: false
-    mirror-conova.debian.org:
-      fastly-backend: false
     mirror-csail.debian.org:
       fastly-backend: false
     mirror-isc.debian.org:
@@ -138,6 +139,11 @@ roles:
       onion_v4_address: 212.211.132.250
     santoro.debian.org:
       fastly-backend: false
+    schmelzer.debian.org:
+      fastly-backend: false
+    schumann.debian.org:
+      service-hostname: schumann.security.backend.mirrors.debian.org
+      fastly-backend: true
     setoguchi.debian.org:
       fastly-backend: false
     sechter.debian.org:
@@ -169,9 +175,11 @@ roles:
     - tate.debian.org
     - ticharich.debian.org
     - wilder.debian.org
+    - wuiet.debian.org
   static_master:
     - dillon.debian.org
     - fasolo.debian.org
+    - manziarly.debian.org
     - porta.debian.org
     - static-master-grnet-01.debian.org
   static_mirror:
@@ -195,6 +203,7 @@ roles:
     - dillon.debian.org
     - donizetti.debian.org
     - fasolo.debian.org
+    - kaufmann.debian.org
     - lindsay.debian.org
     - manziarly.debian.org
     - mekeel.debian.org
@@ -209,9 +218,10 @@ roles:
     - klecker.debian.org
     - milanollo.debian.org
     - mirror-anu.debian.org
-    - mirror-conova.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
+    - schmelzer.debian.org
+    - smit.debian.org
   tracker:
     - ticharich.debian.org
   udd:
@@ -242,7 +252,6 @@ roles:
   bacula_storage:
     - storace.debian.org
   dabackup_client:
-    - moszumanska.debian.org
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org
@@ -254,47 +263,45 @@ roles:
     klecker.debian.org:
       listen-addresses:
         - '130.89.148.12:80'
-        - '[2001:610:1908:b000::148:12]:80'
         - '[2001:67c:2564:a119::148:12]:80'
       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
     mirror-skroutz.debian.org:
       service-hostname: skroutz.debian.backend.mirrors.debian.org
       fastly-backend: true
-    mirror-conova.debian.org:
-      service-hostname: conova.debian.backend.mirrors.debian.org
-      listen-addresses:
-        - '217.196.149.232:80'
-        - '[2a02:16a8:dc41:100::232]:80'
-      fastly-backend: true
     mirror-isc.debian.org:
       listen-addresses:
         - '149.20.4.15:80'
         - '[2001:4f8:1:c::15]:80'
       onion_v4_address: 149.20.4.15
+    schmelzer.debian.org:
+      listen-addresses:
+        - '217.196.149.232:80'
+        - '[2a02:16a8:dc41:100::232]:80'
+      fastly-backend: true
+      service-hostname: conova.debian.backend.mirrors.debian.org
   historical_master:
     - sibelius.debian.org
   historical_mirror:
     - gretchaninov.debian.org
     - klecker.debian.org
-    - mirror-conova.debian.org
+    - schmelzer.debian.org
     - sibelius.debian.org
   debug_mirror:
-    - klecker.debian.org
-    - mirror-conova.debian.org
-    - mirror-isc.debian.org
+    mirror-accumu.debian.org:
+      onion_v4_address: 130.242.6.199
+      service-hostname: accumu.debug.backend.mirrors.debian.org
+    schmelzer.debian.org:
+      listen-addresses:
+        - '217.196.149.232:80'
+        - '[2a02:16a8:dc41:100::232]:80'
+      onion_v4_address: 217.196.149.232
+      service-hostname: conova.debug.backend.mirrors.debian.org
   debug_mirror_onion:
-    - klecker.debian.org
-    - mirror-isc.debian.org
+    - mirror-accumu.debian.org
+    - schmelzer.debian.org
   ports_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -318,8 +325,6 @@ roles:
   onionbalance:
     - olin.debian.org
   bgp:
-    - mirror-bytemark.debian.org
-    - mirror-conova.debian.org
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
   cdimage-search:
@@ -335,10 +340,11 @@ roles:
     - buxtehude.debian.org
     - danzi.debian.org
     - fasolo.debian.org
+    - lw07.debian.org
     - melartin.debian.org
     - sallinen.debian.org
     - seger.debian.org
-    - sibelius.debian.org
+    - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
   salsa.debian.org:
     - godard.debian.org
@@ -356,5 +362,24 @@ roles:
     # Hosts that run apache but where it should not be open to the internet by
     # default
     - casulana.debian.org
+  apache_ratelimited:
+    - beach.debian.org
+    - buxtehude.debian.org
+    - lw07.debian.org
+    - picconi.debian.org
+    - pkgmirror-csail.debian.org
+    - sallinen.debian.org
   cdbuilder_local_mirror:
     - casulana.debian.org
+  alioth_archive:
+    - grabbe.debian.org
+  snapshot_web:
+    - lw07.debian.org
+    - sallinen.debian.org
+  snapshot_shell:
+    - lw08.debian.org
+  anonscm:
+    - cgi-grnet-01.debian.org
+
+classes:
+  - base::includes