projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d8a5c7
)
re-arrange hieradata/common slightly
author
Peter Palfrader
<peter@palfrader.org>
Mon, 16 Sep 2019 08:37:25 +0000
(10:37 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Mon, 16 Sep 2019 08:37:25 +0000
(10:37 +0200)
hieradata/common.yaml
patch
|
blob
|
history
diff --git
a/hieradata/common.yaml
b/hieradata/common.yaml
index
71b1519
..
57ce7a5
100644
(file)
--- a/
hieradata/common.yaml
+++ b/
hieradata/common.yaml
@@
-7,8
+7,13
@@
lookup_options:
apt::sources::debian::location:
merge: unique
apt::sources::debian::location:
merge: unique
+# class parameters
resolv::nameservers: []
resolv::searchpaths: ['debian.org']
resolv::nameservers: []
resolv::searchpaths: ['debian.org']
+staticsync::user: 'staticsync'
+staticsync::basedir: '/srv/static.debian.org'
+
+# other variables
allow_dns_query: []
role_config__mirrors:
mirror_basedir_prefix: '/srv/mirrors/'
allow_dns_query: []
role_config__mirrors:
mirror_basedir_prefix: '/srv/mirrors/'
@@
-27,8
+32,6
@@
paths:
auto_clientcerts_dir: '/srv/puppet.debian.org/ca/RESULT/clientcerts'
apt::sources::debian::location: 'https://deb.debian.org/debian/'
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
# all of these should be retired in favour of including the class role
# with the host. weasel, 2019-09