Rename per-host files

We're getting a bunch of per-host files (all but one of which is currently
irrelevant, admittedly), so rather than put them all at top level, put them in
a subdir.

diff --git a/named.conf.adehnert-test-d b/named.conf.adehnert-test-d
deleted file mode 100644 (file)
index eb9e510..0000000
--- a/named.conf.adehnert-test-d
+++ /dev/null
@@ -1,8 +0,0 @@
-zone "dynamic.dehnerts.com" IN {
-       // secondary is equivalent, starting in bind-9.15.8
-       // https://github.com/isc-projects/bind9/commit/79c2400d91b818e66a45494784cea17f46e807f2
-       type secondary;
-       file "/var/lib/bind/dynamic.dehnerts.zone";
-       masters { "primary-ns"; };
-       allow-query { any; };
-};

diff --git a/named.conf.adehnert3 b/named.conf.adehnert3
deleted file mode 100644 (file)
index 28513bb..0000000
--- a/named.conf.adehnert3
+++ /dev/null
@@ -1,8 +0,0 @@
-zone "dynamic.dehnerts.com" IN {
-       // secondary is equivalent, starting in bind-9.15.8
-       // https://github.com/isc-projects/bind9/commit/79c2400d91b818e66a45494784cea17f46e807f2
-       type slave;
-       file "/var/lib/bind/dynamic.dehnerts.zone";
-       masters { "primary-ns"; };
-       allow-query { any; };
-};

diff --git a/named.conf.chankillo b/named.conf.chankillo
deleted file mode 100644 (file)
index 859023d..0000000
--- a/named.conf.chankillo
+++ /dev/null
@@ -1,23 +0,0 @@
-include "/etc/bind/pri/dynamic.keys";
-
-zone "dynamic.dehnerts.com" IN {
-       type master;
-       file "/var/lib/bind/dynamic.dehnerts.zone";
-       update-policy {
-            grant * selfsub * A TXT;
-            grant xidi.dynamic.dehnerts.com name _acme-challenge.duck-dacha.dynamic.dehnerts.com TXT;
-            grant xidi.dynamic.dehnerts.com name _acme-challenge.homeassistant.dynamic.dehnerts.com TXT;
-            grant xidi.dynamic.dehnerts.com name _acme-challenge.pihole.dynamic.dehnerts.com TXT;
-            grant xidi.dynamic.dehnerts.com name _acme-challenge.unifi.dynamic.dehnerts.com TXT;
-            grant evora.dynamic.dehnerts.com name _acme-challenge.unifi.dynamic.dehnerts.com TXT;
-            grant evora.dynamic.dehnerts.com name _acme-challenge.paperless.dynamic.dehnerts.com TXT;
-            grant chankillo.dynamic.dehnerts.com name _acme-challenge.mail.dynamic.dehnerts.com TXT;
-            grant chankillo.dynamic.dehnerts.com name _acme-challenge.smtp.dynamic.dehnerts.com TXT;
-            grant chankillo.dynamic.dehnerts.com name _acme-challenge.imap.dynamic.dehnerts.com TXT;
-            grant chankillo.dynamic.dehnerts.com name _acme-challenge.pop.dynamic.dehnerts.com TXT;
-            grant chankillo.dynamic.dehnerts.com name _acme-challenge.zulip.dynamic.dehnerts.com TXT;
-        };
-       allow-transfer { "transfer-allowed"; };
-       allow-query { any; };
-       also-notify { "secondary-ns"; };
-};

diff --git a/named.conf.olinda b/named.conf.olinda
deleted file mode 100644 (file)
index 4f8db2b..0000000
--- a/named.conf.olinda
+++ /dev/null
@@ -1 +0,0 @@
-include "/etc/bind/config/dyndehnerts-secondary.conf";

diff --git a/per-host/adehnert-test-d.conf b/per-host/adehnert-test-d.conf
new file mode 100644 (file)
index 0000000..eb9e510
--- /dev/null
+++ b/per-host/adehnert-test-d.conf
@@ -0,0 +1,8 @@
+zone "dynamic.dehnerts.com" IN {
+       // secondary is equivalent, starting in bind-9.15.8
+       // https://github.com/isc-projects/bind9/commit/79c2400d91b818e66a45494784cea17f46e807f2
+       type secondary;
+       file "/var/lib/bind/dynamic.dehnerts.zone";
+       masters { "primary-ns"; };
+       allow-query { any; };
+};

diff --git a/per-host/adehnert3.conf b/per-host/adehnert3.conf
new file mode 100644 (file)
index 0000000..28513bb
--- /dev/null
+++ b/per-host/adehnert3.conf
@@ -0,0 +1,8 @@
+zone "dynamic.dehnerts.com" IN {
+       // secondary is equivalent, starting in bind-9.15.8
+       // https://github.com/isc-projects/bind9/commit/79c2400d91b818e66a45494784cea17f46e807f2
+       type slave;
+       file "/var/lib/bind/dynamic.dehnerts.zone";
+       masters { "primary-ns"; };
+       allow-query { any; };
+};

diff --git a/per-host/chankillo.conf b/per-host/chankillo.conf
new file mode 100644 (file)
index 0000000..859023d
--- /dev/null
+++ b/per-host/chankillo.conf
@@ -0,0 +1,23 @@
+include "/etc/bind/pri/dynamic.keys";
+
+zone "dynamic.dehnerts.com" IN {
+       type master;
+       file "/var/lib/bind/dynamic.dehnerts.zone";
+       update-policy {
+            grant * selfsub * A TXT;
+            grant xidi.dynamic.dehnerts.com name _acme-challenge.duck-dacha.dynamic.dehnerts.com TXT;
+            grant xidi.dynamic.dehnerts.com name _acme-challenge.homeassistant.dynamic.dehnerts.com TXT;
+            grant xidi.dynamic.dehnerts.com name _acme-challenge.pihole.dynamic.dehnerts.com TXT;
+            grant xidi.dynamic.dehnerts.com name _acme-challenge.unifi.dynamic.dehnerts.com TXT;
+            grant evora.dynamic.dehnerts.com name _acme-challenge.unifi.dynamic.dehnerts.com TXT;
+            grant evora.dynamic.dehnerts.com name _acme-challenge.paperless.dynamic.dehnerts.com TXT;
+            grant chankillo.dynamic.dehnerts.com name _acme-challenge.mail.dynamic.dehnerts.com TXT;
+            grant chankillo.dynamic.dehnerts.com name _acme-challenge.smtp.dynamic.dehnerts.com TXT;
+            grant chankillo.dynamic.dehnerts.com name _acme-challenge.imap.dynamic.dehnerts.com TXT;
+            grant chankillo.dynamic.dehnerts.com name _acme-challenge.pop.dynamic.dehnerts.com TXT;
+            grant chankillo.dynamic.dehnerts.com name _acme-challenge.zulip.dynamic.dehnerts.com TXT;
+        };
+       allow-transfer { "transfer-allowed"; };
+       allow-query { any; };
+       also-notify { "secondary-ns"; };
+};

diff --git a/per-host/olinda.conf b/per-host/olinda.conf
new file mode 100644 (file)
index 0000000..4f8db2b
--- /dev/null
+++ b/per-host/olinda.conf
@@ -0,0 +1 @@
+include "/etc/bind/config/dyndehnerts-secondary.conf";