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
2a95753
..
5efaab5
100644
(file)
--- a/
modules/named/files/common/named.conf.acl
+++ b/
modules/named/files/common/named.conf.acl
@@
-3,14
+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
//
-acl Nagios {
- 192.25.206.33/32;
- 206.12.19.118/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 {
// Africa
acl AF {
-
country_AO
;
+
<%= country "AO" %>
;
country_BF;
country_BI;
country_BJ;
country_BF;
country_BI;
country_BJ;
@@
-222,6
+226,7
@@
acl NA {
country_TC;
country_TT;
country_US;
country_TC;
country_TT;
country_US;
+ country_UY;
country_VC;
country_VG;
country_VI;
country_VC;
country_VG;
country_VI;
@@
-241,7
+246,6
@@
acl SA {
country_PE;
country_PY;
country_SR;
country_PE;
country_PY;
country_SR;
- country_UY;
country_VE;
};
country_VE;
};