X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.acl;h=5efaab5d8f4d1a9d8db9b5940fd7e1db386fd007;hb=9ee1b66459e8dceb69c23ea37a9ca027326c3d75;hp=8ca867a800e53fb4e411f1b6d0d64d4a0ce4b42f;hpb=df6f17f669e7977cfe4ffb6e196d27f4f28441a2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl
index 8ca867a80..5efaab5d8 100644
--- a/modules/named/files/common/named.conf.acl
+++ b/modules/named/files/common/named.conf.acl
@@ -3,13 +3,18 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
-acl Nagios {
-	192.25.206.33/32;
-};
+<%- def country
+def country(c)
+    if scope.call_function('versioncmp', [@lsbmajdistrelease, '9']) <= 0
+        "geoip country " + c
+    else
+	"country_" + c
+    end
+end %->
 
 // Africa
 acl AF {
-	country_AO;
+	<%= country "AO" %>;
 	country_BF;
 	country_BI;
 	country_BJ;
@@ -221,6 +226,7 @@ acl NA {
 	country_TC;
 	country_TT;
 	country_US;
+	country_UY;
 	country_VC;
 	country_VG;
 	country_VI;
@@ -240,7 +246,6 @@ acl SA {
 	country_PE;
 	country_PY;
 	country_SR;
-	country_UY;
 	country_VE;
 };
 
@@ -286,4 +291,8 @@ acl AN {
 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
 };