From: Stephen Gran <steve@lobefin.net>
Date: Wed, 1 Jul 2009 19:30:48 +0000 (+0100)
Subject: Samhain fixup
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c9649e335d3ba827cf5ead00f617719dc86e90b7;p=mirror%2Fdsa-puppet.git

Samhain fixup
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index c3f4be595..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 -%>
 
 
@@ -128,6 +129,7 @@ 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