X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=723aa75701d0f609b60899ca4a48b9195a344e1a;hb=267a7cce45366203fdb3848782812cf5ba44b709;hp=e73132781dd47bd23ea4c88efd8694081f78a2d5;hpb=1f3dfc15f637fbc071a90af9872b871792e7a6c7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index e73132781..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,38 +6,6 @@
 view "AF" {
   match-clients { AF; };
 
-  zone "archive.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.archive.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 "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.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";
@@ -46,66 +14,29 @@ view "AF" {
     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 "static.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.www.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";
+  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 "archive.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.archive.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 "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.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";
@@ -114,66 +45,29 @@ view "AN" {
     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 "static.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.www.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";
+  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 "archive.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.archive.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 "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.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";
@@ -182,66 +76,29 @@ view "AS" {
     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 "static.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.www.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";
+  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 "archive.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.archive.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 "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.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";
@@ -250,66 +107,29 @@ view "EU" {
     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 "static.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.static.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.www.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";
+  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 "archive.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.archive.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 "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.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";
@@ -318,66 +138,29 @@ view "NA" {
     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 "static.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.static.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.www.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";
+  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 "archive.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.archive.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 "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.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";
@@ -386,66 +169,29 @@ view "OC" {
     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 "static.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.static.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.www.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";
+  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 "archive.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.archive.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 "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.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";
@@ -454,66 +200,29 @@ view "SA" {
     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 "static.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.static.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.www.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";
+  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 "archive.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.archive.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 "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.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";
@@ -522,66 +231,29 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "static.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.static.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 { };
   };
-
-  zone "www.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
 };
 view "default" {
   match-clients { any; };
 
-  zone "archive.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.archive.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 "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.security.debian.org";
@@ -590,28 +262,23 @@ view "default" {
     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 "static.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.static.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.www.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 { };
   };
-
 };