X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=24069f18ae6f72d502c92a49b288a2e33528ea26;hb=2835c1daf1a5f55ec56366fa5d534b6bfc7728cb;hp=cd8aca40be99e7d4ce92eaf94b855d7ee683bd2e;hpb=994450bdefa5ad03b7417f66dc02c1b3500dc9d4;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index cd8aca40b..24069f18a 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,6 +27,9 @@ 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:
@@ -115,9 +118,6 @@ roles:
     - 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,43 +176,10 @@ roles:
     - 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:
-    - 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
@@ -255,10 +222,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:
@@ -346,16 +309,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:
@@ -371,15 +326,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