projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
make puppetmaster a role included via hiera
[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
a267867
..
aa1cae1
100644
(file)
--- a/
modules/debian_org/templates/puppet.conf.erb
+++ b/
modules/debian_org/templates/puppet.conf.erb
@@
-15,7
+15,7
@@
environment=production
pluginsync=true
<%- end -%>
-<% if
scope.function_has_role(['puppetmaster'])
%>
+<% if
classes.include?('puppetmaster') -
%>
[master]
environmentpath=/srv/puppet.debian.org/stages
cadir = /var/lib/puppet/ssl/ca