X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgeodns%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=8c21bb679d0049c68f349e1f0b0a8ff280c08ea5;hb=3fe0ae3651e9c0433fbe926d19eccc1bf15c259a;hp=8c65496d27031f175936a93ed03dd079a26e5334;hpb=edcf7c0b4b37c0224e1e9604725cbfdf69da9253;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
index 8c65496d2..8c21bb679 100644
--- a/modules/geodns/files/common/named.conf.geo
+++ b/modules/geodns/files/common/named.conf.geo
@@ -3,28 +3,10 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
-view "Nagios" {
-	match-clients {
-		Nagios;
-        };
-        recursion yes;
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.NA";
-		notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.NA";
-		notify no;
-        };
-};
-
 view "Africa" {
 	match-clients {
 		Africa;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
                 file "/etc/bind/db.security.debian.org.AF";
@@ -41,7 +23,6 @@ view "Asia" {
 	match-clients {
 		Asia;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
                 file "/etc/bind/db.security.debian.org.AS";
@@ -58,7 +39,6 @@ view "Europe" {
 	match-clients { 
 		Europe; 
 	};
-        recursion no;
         zone "security.debian.org" {
                 type master;
                 file "/etc/bind/db.security.debian.org.EU";
@@ -75,7 +55,6 @@ view "NorthAmerica" {
 	match-clients {
 		NorthAmerica;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
                 file "/etc/bind/db.security.debian.org.NA";
@@ -91,7 +70,6 @@ view "SouthAmerica" {
 	match-clients {
 		SouthAmerica;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
                 file "/etc/bind/db.security.debian.org.SA";
@@ -107,7 +85,6 @@ view "Oceania" {
 	match-clients {
 		Oceania;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
                 file "/etc/bind/db.security.debian.org.OC";
@@ -123,7 +100,6 @@ view "Antarctica" {
 	match-clients {
 		Antarctica;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
                 file "/etc/bind/db.security.debian.org.AN";
@@ -137,7 +113,6 @@ view "Antarctica" {
 };
 view "other" {
         match-clients { any; };
-        recursion no;
         zone "security.debian.org" {
                 type master;
                 file "/etc/bind/db.security.debian.org";