X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=820dbdbae5771059d32cff24fe580039df2c1b8e;hb=7fbd1fb63f9a8e87683b183e8b39bce18af59a4a;hp=6fca3415073a11cd0cdca84222892fe9c8910991;hpb=592759a869498488ea7227a481b3194989f6c140;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 6fca34150..820dbdbae 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -67,6 +67,9 @@
 # RedefIgnoreNone=(no default)
 # RedefUser0=(no default)
 # RedefUser1=(no default)
+<% if nodeinfo['buildd'] -%>
+IgnoreMissing=/etc/lvm/archive/.*.vg
+<% end -%>
 
 [Attributes]
 ##
@@ -75,7 +78,6 @@
 file=/etc/mtab
 file=/etc/ssh_random_seed
 file=/etc/asound.conf
-file=/etc/resolv.conf
 file=/etc/localtime
 file=/etc/ioctl.save
 file=/etc/passwd.backup
@@ -89,39 +91,17 @@ file=/etc/network/run/ifstate
 file=/var/state/samhain/samhain_file
 file=/etc/bind/zones/db.debian.net
 file=/etc/exim4/bsmtp
-<% if hostname == "geo1" || hostname == "geo2" || hostname == "geo3" -%>
+<% if classes.include?("named::geodns") -%>
 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
-file=/etc/bind/geodns/db.video.debconf.debian.org.EU
-file=/etc/bind/geodns/db.video.debconf.debian.org.AF
-file=/etc/bind/geodns/db.video.debconf.debian.org.OC
-file=/etc/bind/geodns/db.video.debconf.debian.org.SA
-file=/etc/bind/geodns/db.video.debconf.debian.org.AS
-file=/etc/bind/geodns/db.video.debconf.debian.org.NA
-file=/etc/bind/geodns/db.video.debconf.debian.org.AN
-file=/etc/bind/geodns/db.video.debconf.debian.org
 <% end -%>
-
+<% if classes.include?("named") -%>
+file=/etc/bind/named.conf.options
+<% end -%>
+file=/etc/apache2/conf.d/puppet-builddlist
 
 #
 # There are files in /etc that might change, thus changing the directory
@@ -134,8 +114,12 @@ 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
@@ -147,21 +131,22 @@ file=/etc/nagios
 file=/etc/nagios/nrpe.d
 file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
-<%= extradir=""
-case fqdn 
-when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
-file=/etc/puppet"
-else extradir="file=/etc/puppet"
-end
-extradir
-%>
+<% if nodeinfo['nagiosmaster'] -%>
+file=/etc/nagios3/puppetconf.d
+<% end -%>
+file=/etc/puppet
 file=/etc/cron.d
 file=/usr/lib/nagios/plugins
 file=/usr/sbin
 file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
+file=/etc/sysctl.d
 file=/etc/syslog-ng
+file=/etc/ferm/
+file=/etc/ferm/conf.d
+file=/etc/ferm/dsa.d
+file=/etc/rc.local
 
 
 [LogFiles]
@@ -224,6 +209,10 @@ file=/var/log/syslog
 ##
 ## This file might be created or removed by the system sometimes.
 ##
+file=/etc/resolv.conf
+<% if nodeinfo['buildd'] -%>
+file=/etc/dupload.conf
+<% end -%>
 file=/etc/resolv.conf.pcmcia.save
 file=/etc/nologin
 file=/etc/postfix/debian.db
@@ -241,8 +230,10 @@ 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
@@ -254,11 +245,10 @@ file=/etc/exim4/locals
 file=/etc/exim4/localusers
 file=/etc/exim4/manualroute
 file=/etc/exim4/rbllist
-file=/etc/exim4/rcpthosts
 file=/etc/exim4/rhsbllist
+file=/etc/exim4/submission-domains
 file=/etc/exim4/virtualdomains
 file=/etc/exim4/whitelist
-file=/etc/exim4/local-auto.conf
 file=/etc/exim4/local-settings.conf
 file=/etc/exim4/ssl/ca.crt
 file=/etc/exim4/ssl/ca.crl
@@ -268,7 +258,7 @@ file=/etc/ssh/ssh_config
 file=/etc/ssh/sshd_config
 <%=
 out=""
-if not nodeinfo['heavy_exim'].empty?
+if nodeinfo['heavy_exim']
   out = '
 file=/etc/exim4/surbl_whitelist.txt
 file=/etc/exim4/exim_surbl.pl
@@ -279,6 +269,48 @@ 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/apache2/sites-available/www.debian.org
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
@@ -292,6 +324,7 @@ file=/etc/apt/apt.conf.d/local-pdiffs
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey
+file=/etc/default/syslog-ng
 file=/etc/logrotate.d/exim4-paniclog
 file=/etc/logrotate.d/exim4-base
 file=/etc/logrotate.d/syslog-ng
@@ -321,24 +354,47 @@ 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
-<%= extrafiles=""
-case fqdn 
-when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
+file=/etc/cron.d/dsa-buildd
+<% if nodeinfo['nagiosmaster'] -%>
+file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
 file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
 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"
-when "handel.debian.org": extrafiles="dir=8/etc/puppet"
-when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm"
-end
-extrafiles
-%>
+file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
+file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg
+<% end -%>
+<% if nodeinfo['muninmaster'] -%>
+file=/etc/munin/munin.conf
+<% end -%>
+<% if nodeinfo['puppetmaster'] -%>
+dir=8/etc/puppet
+<% end -%>  
+<% if classes.include?('named::geodns') -%>
+dir=1/etc/bind/geodns
+<% end -%>
+<% if classes.include?('named::authoritative') -%>
+dir=1/etc/bind
+file=/etc/bind/named.conf.debian-zones
+<% end -%>
+<% if fqdn == "dijkstra.debian.org" -%>
+dir=4/etc/dsa-kvm
+<% end -%>
+
+<% if nodeinfo['buildd'] -%>
+dir=3/etc/lvm
+<% end -%>
+dir=1/etc/ferm/dsa.d
+file=/etc/ferm/conf.d/me.conf
+file=/etc/ferm/conf.d/defs.conf
+file=/etc/ferm/ferm.conf
+dir=2/etc/ssl/debian
 
 [IgnoreNone]
 ##
@@ -491,7 +547,7 @@ MailSeverity=crit
 PrintSeverity=none
 LogSeverity=info
 SyslogSeverity=alert
-ExportSeverity=none
+#ExportSeverity=none
 
 
 
@@ -558,7 +614,7 @@ ExportSeverity=none
 
 ## Switch on/off
 #
-KernelCheckActive = True
+#KernelCheckActive = True
 
 ## Check interval (seconds); btw., the check is VERY fast
 #
@@ -576,7 +632,7 @@ KernelCheckActive = True
 
 ## Switch on/off
 #
-LoginCheckActive = True
+# LoginCheckActive = True
 
 ## Severity for logins, multiple logins, logouts
 # 
@@ -783,19 +839,12 @@ SetMailNum = 10
 SetMailAddress=samhain-reports@debian.org
 
 ## Mail relay (IP address)
-<%=
-out=""
-if not nodeinfo['smarthost'].empty?
-  out = '
-SetMailRelay = localhost
-'
-else
-out = '
+<% if nodeinfo['smarthost'].empty? -%>
 SetMailRelay = master.debian.org
-'
-end
-out
-%>
+<% else -%>
+SetMailRelay = localhost
+<% end -%>
+
 ## Custom subject format
 #
 MailSubject = [Samhain at %H] %T: %S