X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=e73132781dd47bd23ea4c88efd8694081f78a2d5;hb=1f3dfc15f637fbc071a90af9872b871792e7a6c7;hp=f62c282340eee1ae7a5098ea6a2a060ce089c3ff;hpb=206524a32e769b40cd66b33b5468d3a64a9b5b4a;p=dsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index f62c2823..e7313278 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -22,14 +22,6 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
@@ -98,14 +90,6 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
@@ -174,14 +158,6 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
@@ -250,14 +226,6 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
@@ -326,14 +294,6 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
@@ -402,14 +362,6 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
@@ -478,14 +430,6 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.SA";
@@ -554,14 +498,6 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.undef";
@@ -630,14 +566,6 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";