projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
600c05e
..
ce0cadd
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-150,6
+150,7
@@
file=/etc/rc.local
<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
file=/etc/unbound
<% end -%>
<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
file=/etc/unbound
<% end -%>
+file=/etc/dsa
[LogFiles]
##
[LogFiles]
##
@@
-258,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']
@@
-326,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
@@
-428,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
@@
-840,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
#