From 9ee1b66459e8dceb69c23ea37a9ca027326c3d75 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sat, 12 Aug 2017 16:21:08 +0200 Subject: [PATCH] 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. --- modules/named/files/common/named.conf.acl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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; -- 2.20.1