X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.acl;h=5726379df4ee63fa1a078dff6abc2c7bf2297804;hb=5cecaee41ddc2d1a7b7a57e20c017f53058aedce;hp=42a63495ae89c58e73c8e98d66994d312eae6bb1;hpb=437bd93823b3c12cec48d2d584d21909e494b81e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl
index 42a63495a..5726379df 100644
--- a/modules/named/files/common/named.conf.acl
+++ b/modules/named/files/common/named.conf.acl
@@ -3,10 +3,6 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
-acl Nagios {
-	192.25.206.33/32;
-};
-
 // Africa
 acl AF {
 	country_AO;
@@ -221,6 +217,7 @@ acl NA {
 	country_TC;
 	country_TT;
 	country_US;
+	country_UY;
 	country_VC;
 	country_VG;
 	country_VI;
@@ -240,7 +237,6 @@ acl SA {
 	country_PE;
 	country_PY;
 	country_SR;
-	country_UY;
 	country_VE;
 };
 
@@ -282,3 +278,12 @@ acl AN {
 	country_HM;
 	country_TF;
 };
+
+acl undef {
+	country_A1;
+	country_A2;
+	8.8.8.8/32; // Google DNS Server fails with GeoIP
+	8.8.4.4/32; // Google DNS Server fails with GeoIP
+	208.67.222.222/32; // OpenDNS fails with GeoIP
+	208.67.220.220/32; // OpenDNS fails with GeoIP
+};