make manziarly a static master

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 8333434..cd8aca4 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -2,14 +2,13 @@
 
 lookup_options:
   # with merge: unique entries in other hiera sources add to the array
-  resolv_conf::searchpaths:
+  resolv::searchpaths:
     merge: unique
   apt::sources::debian::location:
     merge: unique
 
-nameservers: []
-resolv_conf::searchpaths: ['debian.org']
-resolv_conf::resolvoptions: []
+resolv::resolv::nameservers: []
+resolv::searchpaths: ['debian.org']
 allow_dns_query: []
 role_config__mirrors:
   mirror_basedir_prefix: '/srv/mirrors/'
@@ -26,7 +25,7 @@ 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: 'http://deb.debian.org/debian/'
+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
@@ -180,6 +179,7 @@ roles:
   static_master:
     - dillon.debian.org
     - fasolo.debian.org
+    - manziarly.debian.org
     - porta.debian.org
     - static-master-grnet-01.debian.org
   static_mirror: