projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a umask 077 for good measure
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
8d69798
..
02c4392
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-113,11
+113,11
@@
file=/etc/default
file=/etc/logrotate.d
file=/etc/nagios
file=/etc/nagios/nrpe.d
file=/etc/logrotate.d
file=/etc/nagios
file=/etc/nagios/nrpe.d
+file=/etc/powerdns
<%= extradir=""
case fqdn
when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
file=/etc/puppet"
<%= extradir=""
case fqdn
when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
file=/etc/puppet"
-when "handel.debian.org": extradir="dir=8/etc/puppet"
else extradir="file=/etc/puppet"
end
extradir
else extradir="file=/etc/puppet"
end
extradir
@@
-128,6
+128,7
@@
file=/usr/sbin
file=/etc/monit
file=/etc/monit/monit.d
file=/etc/pam.d
file=/etc/monit
file=/etc/monit/monit.d
file=/etc/pam.d
+file=/etc/syslog-ng
[LogFiles]
[LogFiles]
@@
-200,6
+201,9
@@
file=/var/lib/misc/ssh-rsa-shadow
file=/etc/.da-backup.trace
file=/etc/postfix/debianhosts
file=/etc/postfix/debianhosts.db
file=/etc/.da-backup.trace
file=/etc/postfix/debianhosts
file=/etc/postfix/debianhosts.db
+file=/etc/blkid.tab
+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/timezone
# We handle these files with puppet - please to not be bothering us
file=/etc/timezone
@@
-226,6
+230,17
@@
file=/etc/exim4/ssl/ca.crt
file=/etc/exim4/ssl/ca.crl
file=/etc/exim4/ssl/thishost.crt
file=/etc/exim4/ssl/thishost.key
file=/etc/exim4/ssl/ca.crl
file=/etc/exim4/ssl/thishost.crt
file=/etc/exim4/ssl/thishost.key
+<%=
+out=""
+if not nodeinfo['heavy_exim'].empty?
+ out = '
+file=/etc/exim4/surbl_whitelist.txt
+file=/etc/exim4/exim_surbl.pl
+file=/etc/exim4/ccTLD.txt
+'
+end
+out
+%>
file=/etc/apt/preferences
file=/etc/apt/sources.list.d/volatile.list
file=/etc/apt/sources.list.d/security.list
file=/etc/apt/preferences
file=/etc/apt/sources.list.d/volatile.list
file=/etc/apt/sources.list.d/security.list
@@
-238,8
+253,11
@@
file=/etc/apt/apt.conf.d/local-recommends
file=/etc/apt/apt.conf.d/local-pdiffs
file=/etc/puppet/puppet.conf
file=/etc/default/puppet
file=/etc/apt/apt.conf.d/local-pdiffs
file=/etc/puppet/puppet.conf
file=/etc/default/puppet
+file=/etc/default/postgrey
file=/etc/logrotate.d/exim4-paniclog
file=/etc/logrotate.d/exim4-base
file=/etc/logrotate.d/exim4-paniclog
file=/etc/logrotate.d/exim4-base
+file=/etc/logrotate.d/syslog-ng
+file=/etc/syslog-ng/syslog-ng.conf
file=/usr/sbin/dsa-update-apt-status
file=/usr/sbin/dsa-update-samhain-status
file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
file=/usr/sbin/dsa-update-apt-status
file=/usr/sbin/dsa-update-samhain-status
file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
@@
-265,12
+283,10
@@
file=/usr/lib/nagios/plugins/dsa-check-raid-sw
file=/usr/lib/nagios/plugins/dsa-update-samhain-status
file=/etc/sudoers
file=/etc/pam.d/sudo
file=/usr/lib/nagios/plugins/dsa-update-samhain-status
file=/etc/sudoers
file=/etc/pam.d/sudo
-file=/etc/blkid.tab
-file=/etc/blkid.tab.old
file=/etc/monit/monitrc
file=/etc/monit/monit.d/01puppet
file=/etc/monit/monit.d/00debian.org
file=/etc/monit/monitrc
file=/etc/monit/monit.d/01puppet
file=/etc/monit/monit.d/00debian.org
-file=/etc/
resolv.conf.dhclient-new
+file=/etc/
powerdns/ip2iso
<%= extrafiles=""
case fqdn
when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
<%= extrafiles=""
case fqdn
when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
@@
-279,6
+295,7
@@
file=/etc/nagios3/puppetconf.d/auto-services.cfg
file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg
file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg
file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg"
file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg
file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg
file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg"
+when "handel.debian.org": extrafiles="dir=8/etc/puppet"
end
extrafiles
%>
end
extrafiles
%>