X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=349a949f9af9e6627c42ccef932d639bc538bf5d;hb=c9649e335d3ba827cf5ead00f617719dc86e90b7;hp=78fad9c146d40acecb97d472721884e8c8d4db7c;hpb=3a8d50d01fcd8639ed429909aead5ff8c002fe10;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 78fad9c14..349a949f9 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -92,7 +92,7 @@ file=/etc/exim4/bsmtp
 <% if hostname == "geo1" || hostname == "geo2" || hostname == "geo3" -%>
 file=/etc/bind/named.conf.acl
 file=/etc/bind/named.conf.options
-file=/etc/bind/geodns/named.conf.geo.security.debian.org
+file=/etc/bind/geodns/named.conf.geo
 file=/etc/bind/geodns/recvconf.files
 file=/etc/bind/geodns/db.security.debian.org.SA
 file=/etc/bind/geodns/db.security.debian.org.OC
@@ -102,6 +102,7 @@ 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=/usr/share/GeoIP/GeoIPv6.dat
 <% end -%>
 
 
@@ -126,7 +127,9 @@ file=/etc/default
 file=/etc/logrotate.d
 file=/etc/nagios
 file=/etc/nagios/nrpe.d
+file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
+file=/usr/share/GeoIP/
 <%= extradir=""
 case fqdn 
 when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
@@ -276,6 +279,7 @@ file=/usr/sbin/dsa-update-samhain-status
 file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
 file=/etc/nagios/nrpe.d/debianorg.cfg
 file=/etc/nagios/obsolete-packages-ignore
+file=/etc/nagios/obsolete-packages-ignore.d/hostspecific
 file=/usr/lib/nagios/plugins/dsa-check-packages
 file=/usr/lib/nagios/plugins/dsa-check-soas
 file=/usr/lib/nagios/plugins/dsa-check-mirrorsync