replace some checks for roles::static_master with staticync::static_master

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4a224b4..e18cf68 100644 (file)
--- 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:
@@ -176,11 +179,6 @@ 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