projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some more squeeze + wheezy fixups
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
cff3dc3
..
24e6478
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-147,7
+147,7
@@
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']
%>
+<% if
(nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy'])
%>
file=/etc/unbound
<% end -%>
file=/etc/dsa
file=/etc/unbound
<% end -%>
file=/etc/dsa
@@
-328,6
+328,7
@@
file=/etc/apt/apt.conf.d/local-pdiffs
file=/etc/puppet/puppet.conf
file=/etc/default/puppet
file=/etc/default/postgrey
file=/etc/puppet/puppet.conf
file=/etc/default/puppet
file=/etc/default/postgrey
+file=/etc/default/schroot
file=/etc/default/syslog-ng
file=/etc/logrotate.d/exim4-paniclog
file=/etc/logrotate.d/exim4-base
file=/etc/default/syslog-ng
file=/etc/logrotate.d/exim4-paniclog
file=/etc/logrotate.d/exim4-base
@@
-398,7
+399,7
@@
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']
%>
+<% if
(nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy'])
%>
file=/etc/unbound/unbound.conf
<% end -%>
file=/etc/unbound/unbound.conf
<% end -%>
@@
-430,6
+431,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
@@
-842,14
+844,9
@@
SetMailNum = 10
## Recipient (max. 8)
#
## Recipient (max. 8)
#
-SetMailAddress=samhain-reports@
debian.org
+SetMailAddress=samhain-reports@
<%= fqdn -%>
-## Mail relay (IP address)
-<% if nodeinfo['smarthost'].empty? -%>
-SetMailRelay = master.debian.org
-<% else -%>
SetMailRelay = localhost
SetMailRelay = localhost
-<% end -%>
## Custom subject format
#
## Custom subject format
#