projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set up armhf porting chroots on armel hosts
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
b0e8965
..
d3da1c4
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-232,7
+232,7
@@
file=/var/log/syslog
## 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.
function_has_role(['buildd'])
-%>
+<% if scope.
lookupvar('site::nodeinfo')['buildd']
-%>
file=/etc/dupload.conf
<% end -%>
file=/etc/resolv.conf.pcmcia.save
file=/etc/dupload.conf
<% end -%>
file=/etc/resolv.conf.pcmcia.save
@@
-250,6
+250,7
@@
file=/etc/blkid.tab.old
file=/etc/resolv.conf.dhclient-new
# We handle these files with puppet - please to not be bothering us
file=/etc/resolv.conf.dhclient-new
# We handle these files with puppet - please to not be bothering us
+file=/etc/dsa/pubsub.conf
file=/etc/nsswitch.conf
file=/etc/timezone
file=/etc/motd.tail
file=/etc/nsswitch.conf
file=/etc/timezone
file=/etc/motd.tail
@@
-290,7
+291,9
@@
file=/etc/aliases
file=/etc/multipath.conf
file=/etc/static-components.conf
file=/etc/rabbitmq/rabbitmq.config
file=/etc/multipath.conf
file=/etc/static-components.conf
file=/etc/rabbitmq/rabbitmq.config
+file=/etc/rabbitmq/enabled_plugins
dir=/etc/bacula/storages-list.d
dir=/etc/bacula/storages-list.d
+dir=/etc/bacula/storage-conf.d
dir=/etc/bacula/conf.d
<%=
out=""
dir=/etc/bacula/conf.d
<%=
out=""