X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=f07a22616a7a1385fa21528adb736ae0694dbc40;hb=07307bc8fa2416ce3b972d891b6fa53d93992a87;hp=4a224b4de65030734f126f2e4049198bcb7e101a;hpb=abe628fb655a708581580999fb26875057dcb2ae;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4a224b4de..f07a22616 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -7,7 +7,7 @@ lookup_options:
   apt::sources::debian::location:
     merge: unique
 
-resolv::resolv::nameservers: []
+resolv::nameservers: []
 resolv::searchpaths: ['debian.org']
 allow_dns_query: []
 role_config__mirrors:
@@ -27,18 +27,14 @@ 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
-  bugs_master:
-    - buxtehude.debian.org
-  bugs_mirror:
-    - beach.debian.org
-  bugs_base:
-    - buxtehude.debian.org
-    - beach.debian.org
   contributors:
     - nono.debian.org
   dbmaster:
@@ -68,10 +64,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  keyring:
-    - kaufmann.debian.org
-  lists:
-    - bendel.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -109,15 +101,10 @@ roles:
     - quantz.debian.org
   rtmaster:
     - reger.debian.org
-  rtc:
-    - vogler.debian.org
   search_backend:
     - wolkenstein.debian.org
   search_frontend:
     - cgi-grnet-01.debian.org
-  archvsync_base_additional:
-  # this is usually pulled in by *-mirror or syncproxy roles
-    - dummy
   security_master:
     - seger.debian.org
   security_mirror:
@@ -176,42 +163,10 @@ roles:
     - ticharich.debian.org
     - wilder.debian.org
     - wuiet.debian.org
-  static_master:
-    - dillon.debian.org
-    - fasolo.debian.org
-    - porta.debian.org
-    - static-master-grnet-01.debian.org
-  static_mirror:
-    - klecker.debian.org
-    - mirror-anu.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - senfter.debian.org
-    - santoro.debian.org
   static_mirror_onion:
     - klecker.debian.org
     - mirror-isc.debian.org
     - senfter.debian.org
-  # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it.  For this, also add it to static_mirror_nopush.
-  static_mirror_nopush:
-    - dummy
-  static_source:
-    - boott.debian.org
-    - casulana.debian.org
-    - coccia.debian.org
-    - dillon.debian.org
-    - donizetti.debian.org
-    - fasolo.debian.org
-    - kaufmann.debian.org
-    - lindsay.debian.org
-    - manziarly.debian.org
-    - mekeel.debian.org
-    - melartin.debian.org
-    - porta.debian.org
-    - philp.debian.org
-    - respighi.debian.org
-    - wolkenstein.debian.org
-    - wuiet.debian.org
   syncproxy:
     - gretchaninov.debian.org
     - klecker.debian.org
@@ -227,16 +182,6 @@ roles:
     - ullmann.debian.org
   vote:
     - vento.debian.org
-  weblog_destination:
-    - wolkenstein.debian.org
-  weblog_provider:
-    - klecker.debian.org
-    - mirror-anu.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - santoro.debian.org
-    - senfter.debian.org
   wiki:
     - wilder.debian.org
   www_master:
@@ -254,10 +199,6 @@ roles:
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org
-  veyepar.debian.org:
-    - vittoria.debian.org
-  sreview.debian.org:
-    - vittoria.debian.org
   debian_mirror:
     klecker.debian.org:
       listen-addresses:
@@ -345,16 +286,8 @@ roles:
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  salsa.debian.org:
-    - godard.debian.org
-  insecure_ssl:
-    - debussy.debian.org
-    - godard.debian.org
   debsources:
     - sor.debian.org
-  ipsec:
-    - fasolo.debian.org
-    - storace.debian.org
   debconf_wafer:
     - debussy.debian.org
   apache_not_public:
@@ -370,15 +303,11 @@ roles:
     - 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