Change path (and line wrapping) for all all domains, to adapt to move /etc/local-* → /usr/local/etc-*.

2 files changed, 54 insertions, 19 deletions

diff --git a/bind/named.conf.fake-222 b/bind/named.conf.fake-222
index 07251d1..8b5ecd1 100644
--- a/bind/named.conf.fake-222
+++ b/bind/named.conf.fake-222
@@ -1,23 +1,41 @@
 // private
-zone "222.168.192.in-addr.arpa"{ type master;	file "/etc/local-JONES.DK/bind/fake-222/192.168.222";	allow-transfer { none; }; };
+zone "222.168.192.in-addr.arpa" { type master; allow-transfer { none; };
+	file "/usr/local/etc-JONES.DK/bind/fake-222/192.168.222"; };
 
 // dk pending
 
 // int. pending
 
 // dk dns.jones.dk
-zone "anniqa.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-222/JONES";		allow-transfer { none; }; }; // Annika Lewis
-zone "bassballs.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-222/JONES";		allow-transfer { none; }; }; // Anders Krøyer
-zone "feliciaweb.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-222/JONES";		allow-transfer { none; }; }; // Anders Krøyer
-zone "jones.dk" { type master; allow-transfer { none; };
+zone "anniqa.dk" {
+	type master; allow-transfer { none; };
+	file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Annika Lewis
+zone "bassballs.dk" {
+	type master; allow-transfer { none; };
+	file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Anders Krøyer
+zone "feliciaweb.dk" {
+	type master; allow-transfer { none; };
+	file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Anders Krøyer
+zone "jones.dk" {
+	type master; allow-transfer { none; };
 	file "/etc/bind/JONES.DK/bind/fake-222/jones.dk.signed"; }; // Jones
-zone "kassandra-production.dk"	{ type master;	file "/etc/local-JONES.DK/bind/fake-222/JONES";		allow-transfer { none; }; }; // Annika Lewis (owner=Spiff)
-zone "peronard.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-222/JONES";		allow-transfer { none; }; }; // Michael L.P. (owner=Spiff)
-zone "xn--abcdefghijklmnopqrstuvxyz-0fc0a81c.dk" { type master;	file "/etc/local-JONES.DK/bind/fake-222/JONES";		allow-transfer { none; }; }; // Jones
+zone "kassandra-production.dk" {
+	type master; allow-transfer { none; };
+	file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Annika Lewis (owner=Spiff)
+zone "peronard.dk" {
+	type master; allow-transfer { none; };
+	file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Michael L.P. (owner=Spiff)
+zone "xn--abcdefghijklmnopqrstuvxyz-0fc0a81c.dk" {
+	type master; allow-transfer { none; };
+	file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Jones
 
 // int. dns.jones.dk
-zone "lejlighederinc.org"		{ type master;	file "/etc/local-JONES.DK/bind/fake-222/JONES-nomail";	allow-transfer { }; }; // Annika Lewis
-zone "xpositionreverse.org"		{ type master;	file "/etc/local-JONES.DK/bind/pri/xpositionreverse.org";	allow-transfer { none; }; }; // Annika Lewis
+zone "lejlighederinc.org" {
+	type master; allow-transfer { none; };
+	file "/usr/local/etc-JONES.DK/bind/fake-222/JONES-nomail"; }; // Annika Lewis
+zone "xpositionreverse.org" {
+	type master; allow-transfer { none; };
+	file "/usr/local/etc-JONES.DK/bind/pri/xpositionreverse.org"; }; // Annika Lewis
 
 // dk suspended dns.jones.dk
 
diff --git a/bind/named.conf.pri b/bind/named.conf.pri
index 7ca252c..aec8f87 100644
--- a/bind/named.conf.pri
+++ b/bind/named.conf.pri
@@ -5,18 +5,35 @@
 // int. pending
 
 // dk dns.jones.dk
-zone "anniqa.dk"			{ type master;	file "/etc/local-JONES.DK/bind/pri/JONES";		allow-transfer { jones_peers; }; }; // Annika Lewis
-zone "bassballs.dk"			{ type master;	file "/etc/local-JONES.DK/bind/pri/JONES";		allow-transfer { jones_peers; }; }; // Anders Krøyer
-zone "feliciaweb.dk"			{ type master;	file "/etc/local-JONES.DK/bind/pri/JONES";		allow-transfer { jones_peers; }; }; // Anders Krøyer
-zone "jones.dk" { type master; allow-transfer { jones_peers; };
+zone "anniqa.dk" {
+	type master; allow-transfer { jones_peers; };
+	file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Annika Lewis
+zone "bassballs.dk" {
+	type master; allow-transfer { jones_peers; };
+	file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Anders Krøyer
+zone "feliciaweb.dk" {
+	type master; allow-transfer { jones_peers; };
+	file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Anders Krøyer
+zone "jones.dk" {
+	type master; allow-transfer { jones_peers; };
 	file "/etc/bind/JONES.DK/pri/jones.dk.signed"; }; // Jones
-zone "kassandra-production.dk"		{ type master;	file "/etc/local-JONES.DK/bind/pri/JONES";		allow-transfer { jones_peers; }; }; // Annika Lewis (owner=Spiff)
-zone "peronard.dk"			{ type master;	file "/etc/local-JONES.DK/bind/pri/JONES";		allow-transfer { jones_peers; }; }; // Michael L.P. (owner=Spiff)
-zone "xn--abcdefghijklmnopqrstuvxyz-0fc0a81c.dk" { type master;	file "/etc/local-JONES.DK/bind/pri/JONES";		allow-transfer { jones_peers; }; }; // Jones
+zone "kassandra-production.dk" {
+	type master; allow-transfer { jones_peers; };
+	file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Annika Lewis (owner=Spiff)
+zone "peronard.dk" {
+	type master; allow-transfer { jones_peers; };
+	file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Michael L.P. (owner=Spiff)
+zone "xn--abcdefghijklmnopqrstuvxyz-0fc0a81c.dk" {
+	type master; allow-transfer { jones_peers; };
+	file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Jones
 
 // int. dns.jones.dk
-zone "lejlighederinc.org"		{ type master;	file "/etc/local-JONES.DK/bind/pri/JONES-nomail";	allow-transfer { jones_peers; }; }; // Annika Lewis
-zone "xpositionreverse.org"		{ type master;	file "/etc/local-JONES.DK/bind/pri/xpositionreverse.org";	allow-transfer { jones_peers; }; }; // Annika Lewis
+zone "lejlighederinc.org" {
+	type master; allow-transfer { jones_peers; };
+	file "/usr/local/etc-JONES.DK/bind/pri/JONES-nomail"; }; // Annika Lewis
+zone "xpositionreverse.org" {
+	type master; allow-transfer { jones_peers; };
+	file "/usr/local/etc-JONES.DK/bind/pri/xpositionreverse.org"; }; // Annika Lewis
 
 // dk suspended dns.jones.dk