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=5726379df4ee63fa1a078dff6abc2c7bf2297804;hpb=7fbd1fb63f9a8e87683b183e8b39bce18af59a4a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl
index 5726379df..5efaab5d8 100644
--- 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;