Add function to emit the correct geoip format for bind versions

[mirror/dsa-puppet.git] / modules / named / files / common / named.conf.acl

diff --git a/modules/named/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl
index 8ca867a..5efaab5 100644 (file)
--- 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
 };