Better version-control per-server config

Also, make adehnert3.xvm a secondary for dynamic.dehnerts.com. It won't be
updated directly, but if olinda goes down, at least there will be a machine
that has the zone data available.

diff --git a/.gitignore b/.gitignore
index 450ad3479d9619963463e0b88aa4b4bcce98167f..37c65669b422262153112418b02ef1d213d8bdb9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 rndc.key
 pri/dynamic.keys
-dyn/
+dyn/*.zone
+dyn/*.zone.jnl
+
+# This should be a symlink to named.conf.$host
+named.conf.per-host

diff --git a/dyn/.keep b/dyn/.keep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/named.conf.adehnert3 b/named.conf.adehnert3
new file mode 100644 (file)
index 0000000..7701e1c
--- /dev/null
+++ b/named.conf.adehnert3
@@ -0,0 +1,6 @@
+zone "dynamic.dehnerts.com" IN {
+       type secondary;
+       file "/etc/bind/dyn/dynamic.zone";
+       master "ns.dehnerts.com";
+       allow-query { any; };
+};

diff --git a/named.conf.local b/named.conf.local
index 8e94176ae484ba9e0218ae62fc46b0fb6d034605..ebc4f17aee6a470afd14996c5c13666d9b9f97bd 100644 (file)
--- a/named.conf.local
+++ b/named.conf.local
@@ -21,17 +21,10 @@ acl "transfer-allowed" {
        74.207.246.137; // arctic
        66.92.29.156;   // copan
        18.18.208.12;   // olinda
+       18.25.129.162;  // adehnert3.xvm
 };
 
-include "/etc/bind/pri/dynamic.keys";
-
-zone "dynamic.dehnerts.com" IN {
-       type master;
-       file "/etc/bind/dyn/dynamic.zone";
-       update-policy { grant * selfsub * A TXT;};
-       allow-transfer { "transfer-allowed"; };
-       allow-query { any; };
-};
+include "/etc/bind/named.conf.per-host";
 
 zone "dynamic.dehnert.arctic.org" IN {
        // DNAME to the real, dynamic.dehnerts.com, zone

diff --git a/named.conf.olinda b/named.conf.olinda
new file mode 100644 (file)
index 0000000..ec76826
--- /dev/null
+++ b/named.conf.olinda
@@ -0,0 +1,9 @@
+include "/etc/bind/pri/dynamic.keys";
+
+zone "dynamic.dehnerts.com" IN {
+       type master;
+       file "/etc/bind/dyn/dynamic.zone";
+       update-policy { grant * selfsub * A TXT;};
+       allow-transfer { "transfer-allowed"; };
+       allow-query { any; };
+};