X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=723aa75701d0f609b60899ca4a48b9195a344e1a;hb=58f7910f2b0c73ee851330952b501db3b017de4d;hp=1864a1c9b4186b047fdb7524b8503e18e468cb3f;hpb=effedfeceeb8f68ef03f471bab80bceb9845caea;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 1864a1c9b..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,33 +6,9 @@
 view "AF" {
   match-clients { AF; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -40,51 +16,30 @@ view "AF" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/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/db.volatile.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -92,51 +47,30 @@ view "AN" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/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/db.volatile.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -144,51 +78,30 @@ view "AS" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/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/db.volatile.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -196,51 +109,30 @@ view "EU" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/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/db.volatile.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -248,51 +140,30 @@ view "NA" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/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/db.volatile.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -300,51 +171,61 @@ view "OC" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/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" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.geo.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.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 "bugs.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -352,51 +233,30 @@ view "SA" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/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.SA";
+  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/db.volatile.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -404,18 +264,21 @@ view "default" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/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 { };
   };
-
 };