projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use rsyncd via systemd on wiki
[mirror/dsa-puppet.git]
/
modules
/
debian_org
/
templates
/
puppet.conf.erb
diff --git
a/modules/debian_org/templates/puppet.conf.erb
b/modules/debian_org/templates/puppet.conf.erb
index
319c47d
..
e094726
100644
(file)
--- a/
modules/debian_org/templates/puppet.conf.erb
+++ b/
modules/debian_org/templates/puppet.conf.erb
@@
-13,8
+13,7
@@
pluginsync=true
# This is the default environment for all clients
environment=production
# This is the default environment for all clients
environment=production
-<%- if scope.lookupvar('::hostname') == 'handel' -%>
-
+<% if scope.function_has_role(['puppetmaster']) %>
[master]
environmentpath=/srv/puppet.debian.org/stages
cadir = /var/lib/puppet/ssl/ca
[master]
environmentpath=/srv/puppet.debian.org/stages
cadir = /var/lib/puppet/ssl/ca