From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 5 Nov 2009 18:36:37 +0000 (+0100)
Subject: Get rid of www.geo
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=18e0a83f5c21c8f764f558784006c974bfc024e1;hp=68a9001c3cd5c120c52a470ffd70fcc7d68964f7;p=mirror%2Fdsa-puppet.git

Get rid of www.geo
---

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 13f6836e7..ad520c37a 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -30,14 +30,6 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.www.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org.AF";
@@ -82,14 +74,6 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.www.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org.AN";
@@ -134,14 +118,6 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.www.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org.AS";
@@ -186,14 +162,6 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.www.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org.EU";
@@ -238,14 +206,6 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.www.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org.NA";
@@ -290,14 +250,6 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.www.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org.OC";
@@ -342,14 +294,6 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.www.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org.SA";
@@ -394,14 +338,6 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.www.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org";