X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.acl;h=5726379df4ee63fa1a078dff6abc2c7bf2297804;hb=84d1e7a9c1728b78c3bca11e8a5505222c3b74ac;hp=f04c9b870f4e48e9a40920ba2570f443dc645cc7;hpb=96f38cb57f542dd3d83e9b0b7bf201e3ec23f2d3;p=dsa-puppet.git

diff --git a/modules/named/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl
index f04c9b87..5726379d 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;
@@ -73,6 +69,7 @@ acl AS {
 	country_AE;
 	country_AF;
 	country_AM;
+	country_AP; // global region Asia/Pacific
 	country_AZ;
 	country_BD;
 	country_BH;
@@ -141,6 +138,7 @@ acl EU {
 	country_DK;
 	country_EE;
 	country_ES;
+	country_EU; // global region Europe
 	country_FI;
 	country_FO;
 	country_FR;
@@ -219,6 +217,7 @@ acl NA {
 	country_TC;
 	country_TT;
 	country_US;
+	country_UY;
 	country_VC;
 	country_VG;
 	country_VI;
@@ -238,7 +237,6 @@ acl SA {
 	country_PE;
 	country_PY;
 	country_SR;
-	country_UY;
 	country_VE;
 };
 
@@ -280,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
+};