projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
temporarily hardcode debian.org and end of searchpaths
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
80a1dc1
..
e72f5d4
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-192,7
+192,7
@@
file=/etc/ssh/userkeys/staticsync
<% if scope.function_has_role(['ssh.upload.d.o']) -%>
file=/etc/ssh/userkeys/buildd-uploader
<% end -%>
<% if scope.function_has_role(['ssh.upload.d.o']) -%>
file=/etc/ssh/userkeys/buildd-uploader
<% end -%>
-<% if
scope.function_has_role(['buildd_master']
) -%>
+<% if
classes.include?('roles::buildd_master'
) -%>
file=/etc/ssh/userkeys/wb-buildd.more
<% end -%>
file=/etc/rsyncd
file=/etc/ssh/userkeys/wb-buildd.more
<% end -%>
file=/etc/rsyncd
@@
-266,7
+266,7
@@
dir=-1/srv
## This file might be created or removed by the system sometimes.
##
file=/etc/resolv.conf
## This file might be created or removed by the system sometimes.
##
file=/etc/resolv.conf
-<% if
scope.lookupvar('site::nodeinfo')['buildd']
-%>
+<% if
classes.include?('roles::buildd')
-%>
file=/etc/dupload.conf
file=/etc/buildd/buildd.conf
file=/etc/sbuild/sbuild.conf
file=/etc/dupload.conf
file=/etc/buildd/buildd.conf
file=/etc/sbuild/sbuild.conf
@@
-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
@@
-507,9
+507,6
@@
file=/usr/share/puppet-dashboard/public/javascripts/all.js
dir=1/usr/share/puppet-dashboard/tmp/pids
<% end -%>
dir=1/usr/share/puppet-dashboard/tmp/pids
<% end -%>
-<% if classes.include?("porterbox") %>
-file=/etc/cron.weekly/puppet-mail-big-homedirs
-<% end -%>
file=/etc/ssl/private/*.key-certchain
dir=10/var/lib/puppet/clientbucket
file=/etc/ssl/private/*.key-certchain
dir=10/var/lib/puppet/clientbucket
@@
-531,7
+528,7
@@
dir=10/var/lib/puppet/clientbucket
## for these files, only access time is ignored
##
dir=/usr/bin
## for these files, only access time is ignored
##
dir=/usr/bin
-<%- if has_variable?("merged_usr") && @merged_us
e
r -%>
+<%- if has_variable?("merged_usr") && @merged_usr -%>
file=/bin
<% else -%>
dir=/bin
file=/bin
<% else -%>
dir=/bin
@@
-541,7
+538,7
@@
dir=/boot
# SuSE (old) has the boot init scripts in /sbin/init.d/*,
# so we go 3 levels deep
#
# SuSE (old) has the boot init scripts in /sbin/init.d/*,
# so we go 3 levels deep
#
-<%- if has_variable?("merged_usr") && @merged_us
e
r -%>
+<%- if has_variable?("merged_usr") && @merged_usr -%>
file=/lib
file=/sbin
<% else -%>
file=/lib
file=/sbin
<% else -%>