X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=d79bbf8b9bbbc12925a47e3bf1be2936f8911bc2;hb=2ca340df04500fd2887bf401502e8b3d17598e35;hp=98ab6b0bfe7aee27730569a3eb4149b2b72b7f26;hpb=6016f53f462346c069a219ef2cda8f049d8ebb7f;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 98ab6b0bf..d79bbf8b9 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -18,6 +18,15 @@ 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'
+
+lookup_options:
+  # entries in other hiera sources add to the array
+  apt::sources::debian::location:
+    merge: unique
+apt::sources::debian::location: 'http://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 +37,6 @@ roles:
   bugs_base:
     - buxtehude.debian.org
     - beach.debian.org
-  buildd_master:
-    - wuiet.debian.org
   contributors:
     - nono.debian.org
   dbmaster:
@@ -59,8 +66,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  jenkins:
-    - jerea.debian.org
   keyring:
     - kaufmann.debian.org
   lists:
@@ -98,8 +103,6 @@ roles:
   pubsub:
     - rainier.debian.org
     - rapoport.debian.org
-  puppetmaster:
-    - handel.debian.org
   qamaster:
     - quantz.debian.org
   rtmaster:
@@ -118,8 +121,6 @@ roles:
   security_mirror:
     mirror-anu.debian.org:
       fastly-backend: false
-    mirror-conova.debian.org:
-      fastly-backend: false
     mirror-csail.debian.org:
       fastly-backend: false
     mirror-isc.debian.org:
@@ -136,6 +137,8 @@ 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
@@ -170,6 +173,7 @@ roles:
     - tate.debian.org
     - ticharich.debian.org
     - wilder.debian.org
+    - wuiet.debian.org
   static_master:
     - dillon.debian.org
     - fasolo.debian.org
@@ -196,6 +200,7 @@ roles:
     - dillon.debian.org
     - donizetti.debian.org
     - fasolo.debian.org
+    - kaufmann.debian.org
     - lindsay.debian.org
     - manziarly.debian.org
     - mekeel.debian.org
@@ -210,9 +215,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:
@@ -243,7 +249,6 @@ roles:
   bacula_storage:
     - storace.debian.org
   dabackup_client:
-    - moszumanska.debian.org
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org
@@ -263,42 +268,37 @@ roles:
     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:
-    mirror-conova.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
-    mirror-isc.debian.org:
-      listen-addresses:
-        - '149.20.4.15:80'
-        - '[2001:4f8:1:c::15]:80'
-      onion_v4_address: 149.20.4.15
-      service-hostname: mirror-isc3.debian.org
-    mirror-accumu.debian.org:
-      onion_v4_address: 130.242.6.199
-      service-hostname: accumu.debug.backend.mirrors.debian.org
   debug_mirror_onion:
-    - mirror-isc.debian.org
     - mirror-accumu.debian.org
+    - schmelzer.debian.org
   ports_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -322,14 +322,12 @@ roles:
   onionbalance:
     - olin.debian.org
   bgp:
-    - mirror-conova.debian.org
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
   cdimage-search:
     - cgi-grnet-01.debian.org
   apache_prefork:
     # php needs this
-    - kantuser.debian.org
     - quantz.debian.org
     - tchaikovsky.debian.org
     - wuiet.debian.org
@@ -339,11 +337,11 @@ roles:
     - buxtehude.debian.org
     - danzi.debian.org
     - fasolo.debian.org
+    - lw07.debian.org
     - melartin.debian.org
     - sallinen.debian.org
     - seger.debian.org
-    - sallinen.debian.org
-    - sibelius.debian.org
+    - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
   salsa.debian.org:
     - godard.debian.org
@@ -375,7 +373,10 @@ roles:
   snapshot_web:
     - lw07.debian.org
     - sallinen.debian.org
-  kanboard:
-    - kantuser.debian.org
+  snapshot_shell:
+    - lw08.debian.org
   anonscm:
     - cgi-grnet-01.debian.org
+
+classes:
+  - base::includes