X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=e99822a2189f651165bb68b22edebb427b44df7d;hb=73d89b3219cb1009f5a7489e624d8d0f9f1463ac;hp=882646c4649f25e556985065fc0e05ffb56c4c32;hpb=cd012d671643b3715799b63568b45ad0901a5056;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 882646c46..e99822a21 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -90,27 +90,12 @@ 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
 file=/etc/bind/named.conf.acl
 file=/etc/bind/named.conf.options
 file=/etc/bind/named.conf.local
 file=/etc/bind/geodns/named.conf.geo
 file=/etc/bind/geodns/recvconf.files
-file=/etc/bind/geodns/db.www.debian.org.SA
-file=/etc/bind/geodns/db.www.debian.org.OC
-file=/etc/bind/geodns/db.www.debian.org.NA
-file=/etc/bind/geodns/db.www.debian.org.EU
-file=/etc/bind/geodns/db.www.debian.org.AS
-file=/etc/bind/geodns/db.www.debian.org.AN
-file=/etc/bind/geodns/db.www.debian.org.AF
-file=/etc/bind/geodns/db.www.debian.org
-file=/etc/bind/geodns/db.security.debian.org.SA
-file=/etc/bind/geodns/db.security.debian.org.OC
-file=/etc/bind/geodns/db.security.debian.org.NA
-file=/etc/bind/geodns/db.security.debian.org.EU
-file=/etc/bind/geodns/db.security.debian.org.AS
-file=/etc/bind/geodns/db.security.debian.org.AN
-file=/etc/bind/geodns/db.security.debian.org.AF
-file=/etc/bind/geodns/db.security.debian.org
 <% end -%>
 
 
@@ -122,10 +107,15 @@ file=/etc
 file=/etc/ssh
 file=/etc/network/run
 file=/etc/bind/zones
+file=/etc/spamassassin/sa-update-keys
 
 # These are the directories for the files we handle with puppet
+file=/etc/apache2/conf.d
+files=/etc/apache2/mods-enabled
 file=/etc/samhain
 file=/etc/munin
+file=/etc/munin/plugins
+file=/etc/munin/plugin-conf.d
 file=/etc/exim4
 file=/etc/exim4/ssl
 file=/etc/apt
@@ -151,6 +141,7 @@ file=/usr/sbin
 file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
+file=/etc/sysctl.d
 file=/etc/syslog-ng
 
 
@@ -231,10 +222,13 @@ file=/etc/resolv.conf.dhclient-new
 # We handle these files with puppet - please to not be bothering us
 file=/etc/timezone
 file=/etc/motd.tail
+file=/etc/ntp.conf
 file=/etc/samhain/samhainrc
 file=/etc/munin/munin-node.conf
+file=/etc/munin/plugin-conf.d/munin-node
 file=/etc/userdir-ldap.confc
 file=/etc/exim4/blacklist
+file=/etc/exim4/host_blacklist
 file=/etc/exim4/callout_users
 file=/etc/exim4/exim4.conf
 file=/etc/exim4/grey_users
@@ -253,6 +247,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/ssh/ssh_config
+file=/etc/ssh/sshd_config
 <%=
 out=""
 if not nodeinfo['heavy_exim'].empty?
@@ -260,10 +256,53 @@ if not nodeinfo['heavy_exim'].empty?
 file=/etc/exim4/surbl_whitelist.txt
 file=/etc/exim4/exim_surbl.pl
 file=/etc/exim4/ccTLD.txt
+file=/etc/clamav-unofficial-sigs.conf
+file=/etc/clamav-unofficial-sigs.dsa.conf
 '
 end
 out
 %>
+file=/etc/munin/plugins/bind
+file=/etc/munin/plugins/bind_views
+file=/etc/munin/plugins/cpu
+file=/etc/munin/plugins/df
+file=/etc/munin/plugins/df_abs
+file=/etc/munin/plugins/df_inode
+file=/etc/munin/plugins/entropy
+file=/etc/munin/plugins/forks
+file=/etc/munin/plugins/interrupts
+file=/etc/munin/plugins/iostat
+file=/etc/munin/plugins/irqstats
+file=/etc/munin/plugins/load
+file=/etc/munin/plugins/memory
+file=/etc/munin/plugins/ntp_offset
+file=/etc/munin/plugins/ntp_states
+file=/etc/munin/plugins/open_files
+file=/etc/munin/plugins/open_inodes
+file=/etc/munin/plugins/processes
+file=/etc/munin/plugins/ps_apache2
+file=/etc/munin/plugins/ps_exim4
+file=/etc/munin/plugins/ps_vsftpd
+file=/etc/munin/plugins/spamassassin
+file=/etc/munin/plugins/swap
+file=/etc/munin/plugins/uptime
+file=/etc/munin/plugins/vmstat
+file=/etc/munin/plugins/vfstpd
+file=/etc/munin/plugins/apache_accesses
+file=/etc/munin/plugins/apache_processes
+file=/etc/munin/plugins/apache_volume
+file=/etc/munin/plugins/apache_servers
+file=/etc/munin/plugins/exim_mailqueue
+file=/etc/munin/plugins/exim_mailstats
+file=/etc/munin/plugins/postfix_mailqueue
+file=/etc/munin/plugins/postfix_mailvolume
+file=/etc/apache2/conf.d/ressource-limits
+file=/etc/apache2/mods-enabled/info.conf
+file=/etc/apache2/mods-enabled/info.load
+file=/etc/apache2/mods-enabled/server.conf
+file=/etc/apache2/mods-enabled/server.load
+file=/etc/apache2/conf.d/server-status
+file=/etc/apache2/conf.d/local-serverinfo
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
@@ -306,11 +345,13 @@ 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=/etc/sysctl.d/mmap_min_addr.conf
 file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
 file=/etc/monit/monit.d/00debian.org
 file=/etc/cron.d/dsa-puppet-stuff
+file=/etc/cron.d/dsa-buildd
 <%= extrafiles=""
 case fqdn 
 when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
@@ -321,6 +362,7 @@ 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"
 when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm"
+when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns"
 end
 extrafiles
 %>