X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgeodns%2Ffiles%2Fcommon%2Fnamed.conf.acl;h=f04c9b870f4e48e9a40920ba2570f443dc645cc7;hb=6e3a2b45f6a0b7aff9532256a7421228fea8cb01;hp=d2c02bbbda8aab4ee58227f42e7a9a3a614eb5bc;hpb=e606ae2a7f7259e4c6e42aa88fbc1cd7216036ca;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/files/common/named.conf.acl b/modules/geodns/files/common/named.conf.acl
index d2c02bbbd..f04c9b870 100644
--- a/modules/geodns/files/common/named.conf.acl
+++ b/modules/geodns/files/common/named.conf.acl
@@ -3,9 +3,12 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
+acl Nagios {
+	192.25.206.33/32;
+};
 
 // Africa
-acl Africa {
+acl AF {
 	country_AO;
 	country_BF;
 	country_BI;
@@ -66,7 +69,7 @@ acl Africa {
 };
 
 // Asia
-acl Asia {
+acl AS {
 	country_AE;
 	country_AF;
 	country_AM;
@@ -116,7 +119,6 @@ acl Asia {
 	country_TJ;
 	country_TL;
 	country_TM;
-	country_TR;
 	country_TW;
 	country_UZ;
 	country_VN;
@@ -124,7 +126,7 @@ acl Asia {
 };
 
 // Europe
-acl Europe {
+acl EU {
 	country_AD;
 	country_AL;
 	country_AT;
@@ -174,12 +176,13 @@ acl Europe {
 	country_SJ;
 	country_SK;
 	country_SM;
+	country_TR;
 	country_UA;
 	country_VA;
 };
 
 // North America
-acl NorthAmerica {
+acl NA {
 	country_AG;
 	country_AI;
 	country_AN;
@@ -222,7 +225,7 @@ acl NorthAmerica {
 };
 
 // South America
-acl SouthAmerica {
+acl SA {
 	country_AR;
 	country_BO;
 	country_BR;
@@ -240,7 +243,7 @@ acl SouthAmerica {
 };
 
 // Oceania
-acl Oceania {
+acl OC {
 	country_AS;
 	country_AU;
 	country_CK;
@@ -270,7 +273,7 @@ acl Oceania {
 };
 
 // Antarctica
-acl Antarctica {
+acl AN {
 	country_AQ;
 	country_BV;
 	country_GS;