From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 27 Jun 2010 14:35:00 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=399d35984a7b52c7e5b30a3e57c36770311a8321;hp=26097605f7821bc8ec1598b11675a5c15afd0542;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  s/ries/FTPHOSTS/
---

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 6a682fd9f..13603f2c8 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -14,14 +14,6 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
@@ -82,14 +74,6 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
@@ -150,14 +134,6 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
@@ -218,14 +194,6 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
@@ -286,14 +254,6 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
@@ -354,14 +314,6 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
@@ -422,14 +374,6 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
@@ -490,14 +434,6 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
@@ -558,14 +494,6 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org";