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
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
66a39c6
..
987a3a2
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-463,7
+463,7
@@
file=/etc/nagios3/puppetconf.d/contacts.cfg
<% if scope.function_has_role(['muninmaster']) -%>
file=/etc/munin/munin.conf
<% end -%>
<% if scope.function_has_role(['muninmaster']) -%>
file=/etc/munin/munin.conf
<% end -%>
-<% if
scope.function_has_role(['puppetmaster']
) -%>
+<% if
classes.include?('roles::puppetmaster'
) -%>
dir=8/etc/puppet
<% end -%>
<% if classes.include?('named::geodns') -%>
dir=8/etc/puppet
<% end -%>
<% if classes.include?('named::geodns') -%>
@@
-497,7
+497,7
@@
file=/etc/openvpn/deb-mgmt-clients.pool
file=/etc/rsyncd/debian.secrets
file=/etc/rsyncd/debian.secrets
-<% if
scope.function_has_role(['puppetmaster'])
%>
+<% if
classes.include?('roles::puppetmaster') -
%>
# Damn you rails apps and your shoddy packaging
file=/usr/share/puppet-dashboard/public/stylesheets
# Damn you rails apps and your shoddy packaging
file=/usr/share/puppet-dashboard/public/stylesheets