gluck: nor more virtualdomains. master: debian.{com,net}

[mirror/dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 349a949..c20f9bf 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -92,8 +92,17 @@ 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/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
@@ -102,7 +111,6 @@ 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 -%>
 
 
@@ -129,7 +137,6 @@ 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