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 ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
80f09b4
..
b4ff18e
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-90,6
+90,7
@@
file=/var/state/samhain/samhain_file
file=/etc/bind/zones/db.debian.net
file=/etc/exim4/bsmtp
<% if hostname == "geo1" || hostname == "geo2" || hostname == "geo3" -%>
file=/etc/bind/zones/db.debian.net
file=/etc/exim4/bsmtp
<% if hostname == "geo1" || hostname == "geo2" || hostname == "geo3" -%>
+file=/etc/bind
file=/etc/bind/named.conf.acl
file=/etc/bind/named.conf.options
file=/etc/bind/named.conf.local
file=/etc/bind/named.conf.acl
file=/etc/bind/named.conf.options
file=/etc/bind/named.conf.local
@@
-133,6
+134,7
@@
file=/etc/bind/zones
file=/etc/spamassassin/sa-update-keys
# These are the directories for the files we handle with puppet
file=/etc/spamassassin/sa-update-keys
# These are the directories for the files we handle with puppet
+file=/etc/apache2/conf.d
file=/etc/samhain
file=/etc/munin
file=/etc/exim4
file=/etc/samhain
file=/etc/munin
file=/etc/exim4
@@
-160,6
+162,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/sysctl.d
file=/etc/syslog-ng
file=/etc/syslog-ng
@@
-263,6
+266,8
@@
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
+file=/etc/ssh/ssh_config
+file=/etc/ssh/sshd_config
<%=
out=""
if not nodeinfo['heavy_exim'].empty?
<%=
out=""
if not nodeinfo['heavy_exim'].empty?
@@
-276,6
+281,7
@@
file=/etc/clamav-unofficial-sigs.dsa.conf
end
out
%>
end
out
%>
+file=/etc/apache2/conf.d/ressource-limits
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
@@
-318,6
+324,7
@@
file=/usr/lib/nagios/plugins/dsa-check-raid-areca
file=/usr/lib/nagios/plugins/dsa-check-raid-sw
file=/usr/lib/nagios/plugins/dsa-update-samhain-status
file=/etc/sudoers
file=/usr/lib/nagios/plugins/dsa-check-raid-sw
file=/usr/lib/nagios/plugins/dsa-update-samhain-status
file=/etc/sudoers
+file=/etc/sysctl.d/mmap_min_addr.conf
file=/etc/pam.d/sudo
file=/etc/monit/monitrc
file=/etc/monit/monit.d/01puppet
file=/etc/pam.d/sudo
file=/etc/monit/monitrc
file=/etc/monit/monit.d/01puppet