From: Stephen Gran <steve@lobefin.net>
Date: Sat, 19 Sep 2009 16:38:12 +0000 (+0100)
Subject: some pretty printing
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=09f68d13097714909e8537c1ff82d8ccf4da6238;p=mirror%2Fdsa-puppet.git

some pretty printing

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
index 026fe5f77..9f28c536d 100644
--- a/modules/geodns/files/common/named.conf.geo
+++ b/modules/geodns/files/common/named.conf.geo
@@ -5,65 +5,353 @@
 
 view "AF" {
   match-clients { AF; };
-  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 "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.AF"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "www.debian.org" { type master; file "/etc/bind/geodns/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"; 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 "www.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/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";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };
 view "AN" {
   match-clients { AN; };
-  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 "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.AN"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "www.debian.org" { type master; file "/etc/bind/geodns/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"; 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 "www.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/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";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };
 view "AS" {
   match-clients { AS; };
-  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 "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.AS"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "www.debian.org" { type master; file "/etc/bind/geodns/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"; 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 "www.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/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";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };
 view "EU" {
   match-clients { EU; };
-  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 "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.EU"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "www.debian.org" { type master; file "/etc/bind/geodns/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"; 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 "www.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/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";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };
 view "NA" {
   match-clients { NA; };
-  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 "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.NA"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "www.debian.org" { type master; file "/etc/bind/geodns/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"; 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 "www.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/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";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };
 view "OC" {
   match-clients { OC; };
-  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 "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.OC"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "www.debian.org" { type master; file "/etc/bind/geodns/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"; 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 "www.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/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";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };
 view "SA" {
   match-clients { SA; };
-  zone "security.geo.debian.org" { type master; file "/etc/bind/geodns/db.security.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"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.SA"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "www.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.SA"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "packages.debian.org" { type master; file "/etc/bind/geodns/db.packages.debian.org.SA"; notify no; allow-query { any; }; allow-transfer { }; };
+
+  zone "security.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.security.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";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "packages.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.packages.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };
 view "default" {
   match-clients { any; };
-  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 "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org"; notify no; allow-query { any; }; allow-transfer { }; };
-  zone "www.debian.org" { type master; file "/etc/bind/geodns/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"; 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 "www.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/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";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };