projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the array did work
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
58cb651
..
1757345
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-78,10
+78,6
@@
IgnoreMissing=/etc/lvm/archive/.*.vg
file=/etc/mtab
file=/etc/ssh_random_seed
file=/etc/asound.conf
file=/etc/mtab
file=/etc/ssh_random_seed
file=/etc/asound.conf
-<% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
-<% else -%>
-file=/etc/resolv.conf
-<% end -%>
file=/etc/localtime
file=/etc/ioctl.save
file=/etc/passwd.backup
file=/etc/localtime
file=/etc/ioctl.save
file=/etc/passwd.backup
@@
-105,6
+101,7
@@
file=/etc/bind/geodns/recvconf.files
<% if classes.include?("named") -%>
file=/etc/bind/named.conf.options
<% end -%>
<% if classes.include?("named") -%>
file=/etc/bind/named.conf.options
<% end -%>
+file=/etc/apache2/conf.d/puppet-builddlist
#
# There are files in /etc that might change, thus changing the directory
#
# There are files in /etc that might change, thus changing the directory
@@
-150,7
+147,10
@@
file=/etc/ferm/
file=/etc/ferm/conf.d
file=/etc/ferm/dsa.d
file=/etc/rc.local
file=/etc/ferm/conf.d
file=/etc/ferm/dsa.d
file=/etc/rc.local
-
+<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+file=/etc/unbound
+<% end -%>
+file=/etc/dsa
[LogFiles]
##
[LogFiles]
##
@@
-212,9
+212,7
@@
file=/var/log/syslog
##
## This file might be created or removed by the system sometimes.
##
##
## This file might be created or removed by the system sometimes.
##
-<% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
file=/etc/resolv.conf
file=/etc/resolv.conf
-<% end -%>
<% if nodeinfo['buildd'] -%>
file=/etc/dupload.conf
<% end -%>
<% if nodeinfo['buildd'] -%>
file=/etc/dupload.conf
<% end -%>
@@
-261,6
+259,7
@@
file=/etc/exim4/ssl/thishost.crt
file=/etc/exim4/ssl/thishost.key
file=/etc/ssh/ssh_config
file=/etc/ssh/sshd_config
file=/etc/exim4/ssl/thishost.key
file=/etc/ssh/ssh_config
file=/etc/ssh/sshd_config
+file=/etc/dsa/cron.ignore.dsa-puppet-stuff
<%=
out=""
if nodeinfo['heavy_exim']
<%=
out=""
if nodeinfo['heavy_exim']
@@
-391,7
+390,6
@@
file=/etc/bind/named.conf.debian-zones
<% if fqdn == "dijkstra.debian.org" -%>
dir=4/etc/dsa-kvm
<% end -%>
<% if fqdn == "dijkstra.debian.org" -%>
dir=4/etc/dsa-kvm
<% end -%>
-
<% if nodeinfo['buildd'] -%>
dir=3/etc/lvm
<% end -%>
<% if nodeinfo['buildd'] -%>
dir=3/etc/lvm
<% end -%>
@@
-400,6
+398,9
@@
file=/etc/ferm/conf.d/me.conf
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
dir=2/etc/ssl/debian
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
dir=2/etc/ssl/debian
+<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+file=/etc/unbound/unbound.conf
+<% end -%>
[IgnoreNone]
##
[IgnoreNone]
##
@@
-429,6
+430,7
@@
dir=3/sbin
dir=/usr/sbin
dir=/lib
dir=3/usr/lib
dir=/usr/sbin
dir=/lib
dir=3/usr/lib
+dir=3/usr/share
#
# RedHat and Debian have the bootinit scripts in /etc/init.d/* or /etc/rc.d/*,
# so we go 3 levels deep there too
#
# RedHat and Debian have the bootinit scripts in /etc/init.d/* or /etc/rc.d/*,
# so we go 3 levels deep there too