Add function to emit the correct geoip format for bind versions

BIND 9.9 and BIND 9.10 have different formats for geoip.  Add a
function that DTRT, and test it slightly before doing it to all countries.

diff --git a/modules/named/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl
index 5726379..5efaab5 100644 (file)
--- a/modules/named/files/common/named.conf.acl
+++ b/modules/named/files/common/named.conf.acl
@@ -3,9 +3,18 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
+<%- 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;