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

[dsa-puppet.git] / modules / named / files / common / named.conf.geo

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 1864a1c9b4186b047fdb7524b8503e18e468cb3f..57fe21996a5d1394e79937ae401caf57107dd42f 100644 (file)
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -30,6 +30,14 @@ view "AF" {
     allow-transfer { };
   };
 
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/db.bugs.debian.org.AF";
@@ -82,6 +90,14 @@ view "AN" {
     allow-transfer { };
   };
 
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/db.bugs.debian.org.AN";
@@ -134,6 +150,14 @@ view "AS" {
     allow-transfer { };
   };
 
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/db.bugs.debian.org.AS";
@@ -186,6 +210,14 @@ view "EU" {
     allow-transfer { };
   };
 
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/db.bugs.debian.org.EU";
@@ -238,6 +270,14 @@ view "NA" {
     allow-transfer { };
   };
 
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/db.bugs.debian.org.NA";
@@ -290,6 +330,14 @@ view "OC" {
     allow-transfer { };
   };
 
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/db.bugs.debian.org.OC";
@@ -342,6 +390,14 @@ view "SA" {
     allow-transfer { };
   };
 
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/db.bugs.debian.org.SA";
@@ -366,6 +422,66 @@ view "SA" {
     allow-transfer { };
   };
 
+};
+view "undef" {
+  match-clients { undef; };
+
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.security.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.security.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "packages.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.packages.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };
 view "default" {
   match-clients { any; };
@@ -394,6 +510,14 @@ view "default" {
     allow-transfer { };
   };
 
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/db.bugs.debian.org";