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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index e99822a21..1efe18550 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.*.vg
+<% end -%>
 
 [Attributes]
 ##
@@ -75,7 +78,10 @@
 file=/etc/mtab
 file=/etc/ssh_random_seed
 file=/etc/asound.conf
+<% case hoster when "ubcece", "darmstadt", "ftcollins" then ""
+else -%>
 file=/etc/resolv.conf
+<% end -%>
 file=/etc/localtime
 file=/etc/ioctl.save
 file=/etc/passwd.backup
@@ -128,13 +134,13 @@ 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
+if nodeinfo['nagiosmaster']
+  extradir="file=/etc/nagios3/puppetconf.d
 file=/etc/puppet"
-else extradir="file=/etc/puppet"
 end
 extradir
 %>
+file=/etc/puppet
 file=/etc/cron.d
 file=/usr/lib/nagios/plugins
 file=/usr/sbin
@@ -143,6 +149,8 @@ file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/sysctl.d
 file=/etc/syslog-ng
+file=/etc/ferm/conf.d
+file=/etc/ferm/dsa.d
 
 
 [LogFiles]
@@ -205,6 +213,10 @@ file=/var/log/syslog
 ##
 ## This file might be created or removed by the system sometimes.
 ##
+<% case hoster when "ubcece", "darmstadt", "ftcollins" then "" -%>
+file=/etc/resolv.conf
+<% else
+end -%>
 file=/etc/resolv.conf.pcmcia.save
 file=/etc/nologin
 file=/etc/postfix/debian.db
@@ -237,11 +249,9 @@ 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/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
@@ -354,19 +364,30 @@ 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
+when "tchaikovsky.debian.org": extrafiles="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"
+file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
+file=/etc/munin/munin.conf"
 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"
+when /(senfl|ravel|orff|klecker).debian.org/: extrafiles="dir=1/etc/bind
+file=/etc/bind/named.conf.debian-zones"
 end
 extrafiles
 %>
 
+<% 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
+
 [IgnoreNone]
 ##
 ## for these files, all modifications (even access time) are reported