projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
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
//
// 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 {
// Africa
acl AF {
-
country_AO
;
+
<%= country "AO" %>
;
country_BF;
country_BI;
country_BJ;
country_BF;
country_BI;
country_BJ;