X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=723aa75701d0f609b60899ca4a48b9195a344e1a;hb=9ee1b66459e8dceb69c23ea37a9ca027326c3d75;hp=13603f2c8489e6e5426e6ce33c76834bcd6a7a84;hpb=399d35984a7b52c7e5b30a3e57c36770311a8321;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 13603f2c8..723aa7570 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -1,4 +1,4 @@
-// This file was created by dsa-geodomains/zonebuilder --create-named-conf
+// This file was created by auto-dns/build-zones --create-named-conf
 // and is distributed to hosts using puppet as
 // dsa-puppet/modules/geodns/files/common/named.conf.geo
 // you probably do not want to edit it manually wherever you find it
@@ -6,14 +6,6 @@
 view "AF" {
   match-clients { AF; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -22,30 +14,6 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
@@ -54,26 +22,21 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
+  zone "29.172.in-addr.arpa" {
+    type slave;
     notify no;
+    file "db.29.172.in-addr.arpa-AF";
+    masters {
+      82.195.75.91; // denis
+      2001:41b8:202:deb:1b1b::91; // denis
+    };
     allow-query { any; };
     allow-transfer { };
   };
-
 };
 view "AN" {
   match-clients { AN; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -82,30 +45,6 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
@@ -114,26 +53,21 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
+  zone "29.172.in-addr.arpa" {
+    type slave;
     notify no;
+    file "db.29.172.in-addr.arpa-AN";
+    masters {
+      82.195.75.91; // denis
+      2001:41b8:202:deb:1b1b::91; // denis
+    };
     allow-query { any; };
     allow-transfer { };
   };
-
 };
 view "AS" {
   match-clients { AS; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -142,30 +76,6 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
@@ -174,26 +84,21 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
+  zone "29.172.in-addr.arpa" {
+    type slave;
     notify no;
+    file "db.29.172.in-addr.arpa-AS";
+    masters {
+      82.195.75.91; // denis
+      2001:41b8:202:deb:1b1b::91; // denis
+    };
     allow-query { any; };
     allow-transfer { };
   };
-
 };
 view "EU" {
   match-clients { EU; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -202,30 +107,6 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
@@ -234,26 +115,21 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
+  zone "29.172.in-addr.arpa" {
+    type slave;
     notify no;
+    file "db.29.172.in-addr.arpa-EU";
+    masters {
+      82.195.75.91; // denis
+      2001:41b8:202:deb:1b1b::91; // denis
+    };
     allow-query { any; };
     allow-transfer { };
   };
-
 };
 view "NA" {
   match-clients { NA; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -262,30 +138,6 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
@@ -294,26 +146,21 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
+  zone "29.172.in-addr.arpa" {
+    type slave;
     notify no;
+    file "db.29.172.in-addr.arpa-NA";
+    masters {
+      82.195.75.91; // denis
+      2001:41b8:202:deb:1b1b::91; // denis
+    };
     allow-query { any; };
     allow-transfer { };
   };
-
 };
 view "OC" {
   match-clients { OC; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -322,30 +169,6 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
@@ -354,26 +177,21 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
+  zone "29.172.in-addr.arpa" {
+    type slave;
     notify no;
+    file "db.29.172.in-addr.arpa-OC";
+    masters {
+      82.195.75.91; // denis
+      2001:41b8:202:deb:1b1b::91; // denis
+    };
     allow-query { any; };
     allow-transfer { };
   };
-
 };
 view "SA" {
   match-clients { SA; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -382,30 +200,6 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
@@ -414,26 +208,21 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
+  zone "29.172.in-addr.arpa" {
+    type slave;
     notify no;
+    file "db.29.172.in-addr.arpa-SA";
+    masters {
+      82.195.75.91; // denis
+      2001:41b8:202:deb:1b1b::91; // denis
+    };
     allow-query { any; };
     allow-transfer { };
   };
-
 };
 view "undef" {
   match-clients { undef; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -442,30 +231,6 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
@@ -474,26 +239,21 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
+  zone "29.172.in-addr.arpa" {
+    type slave;
     notify no;
+    file "db.29.172.in-addr.arpa-undef";
+    masters {
+      82.195.75.91; // denis
+      2001:41b8:202:deb:1b1b::91; // denis
+    };
     allow-query { any; };
     allow-transfer { };
   };
-
 };
 view "default" {
   match-clients { any; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org";
@@ -502,30 +262,6 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org";
@@ -534,12 +270,15 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
+  zone "29.172.in-addr.arpa" {
+    type slave;
     notify no;
+    file "db.29.172.in-addr.arpa-default";
+    masters {
+      82.195.75.91; // denis
+      2001:41b8:202:deb:1b1b::91; // denis
+    };
     allow-query { any; };
     allow-transfer { };
   };
-
 };