From 7d69f7d97603e606f87c6892fdd10642272b9c18 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 19 Jun 2020 20:17:17 +0200 Subject: drop templates JONES-www+source+media JONES-www+source+admin+media --- bind/fake-222/JONES-www+source+admin+media | 13 ------------- bind/fake-222/JONES-www+source+media | 12 ------------ bind/fake-222/couchdesign.dk | 12 ++++++++++++ bind/fake-222/public-e.dk | 13 +++++++++++++ bind/named.conf.fake-222 | 4 ++-- bind/named.conf.pri | 4 ++-- bind/pri/JONES-www+source+admin+media | 13 ------------- bind/pri/JONES-www+source+media | 12 ------------ bind/pri/couchdesign.dk | 12 ++++++++++++ bind/pri/public-e.dk | 13 +++++++++++++ 10 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 bind/fake-222/JONES-www+source+admin+media delete mode 100644 bind/fake-222/JONES-www+source+media create mode 100644 bind/fake-222/couchdesign.dk create mode 100644 bind/fake-222/public-e.dk delete mode 100644 bind/pri/JONES-www+source+admin+media delete mode 100644 bind/pri/JONES-www+source+media create mode 100644 bind/pri/couchdesign.dk create mode 100644 bind/pri/public-e.dk (limited to 'bind') diff --git a/bind/fake-222/JONES-www+source+admin+media b/bind/fake-222/JONES-www+source+admin+media deleted file mode 100644 index b1f5c75..0000000 --- a/bind/fake-222/JONES-www+source+admin+media +++ /dev/null @@ -1,13 +0,0 @@ -$TTL 1w -@ IN SOA localhost. root.localhost. ( - 1 - 4h 1h 1w 1h ) - -$INCLUDE /etc/local-JONES.DK/bind/skel/A-222 -$INCLUDE /etc/local-JONES.DK/bind/skel/MX -@ NS localhost. - -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME admin -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media diff --git a/bind/fake-222/JONES-www+source+media b/bind/fake-222/JONES-www+source+media deleted file mode 100644 index 57419a7..0000000 --- a/bind/fake-222/JONES-www+source+media +++ /dev/null @@ -1,12 +0,0 @@ -$TTL 1w -@ IN SOA localhost. root.localhost. ( - 1 - 4h 1h 1w 1h ) - -$INCLUDE /etc/local-JONES.DK/bind/skel/A-222 -$INCLUDE /etc/local-JONES.DK/bind/skel/MX -@ NS localhost. - -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media diff --git a/bind/fake-222/couchdesign.dk b/bind/fake-222/couchdesign.dk new file mode 100644 index 0000000..57419a7 --- /dev/null +++ b/bind/fake-222/couchdesign.dk @@ -0,0 +1,12 @@ +$TTL 1w +@ IN SOA localhost. root.localhost. ( + 1 + 4h 1h 1w 1h ) + +$INCLUDE /etc/local-JONES.DK/bind/skel/A-222 +$INCLUDE /etc/local-JONES.DK/bind/skel/MX +@ NS localhost. + +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media diff --git a/bind/fake-222/public-e.dk b/bind/fake-222/public-e.dk new file mode 100644 index 0000000..b1f5c75 --- /dev/null +++ b/bind/fake-222/public-e.dk @@ -0,0 +1,13 @@ +$TTL 1w +@ IN SOA localhost. root.localhost. ( + 1 + 4h 1h 1w 1h ) + +$INCLUDE /etc/local-JONES.DK/bind/skel/A-222 +$INCLUDE /etc/local-JONES.DK/bind/skel/MX +@ NS localhost. + +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME admin +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media diff --git a/bind/named.conf.fake-222 b/bind/named.conf.fake-222 index 5e43532..c135891 100644 --- a/bind/named.conf.fake-222 +++ b/bind/named.conf.fake-222 @@ -33,7 +33,7 @@ zone "cityseeing.dk" { file "/etc/local-JONES.DK/bind/fake-222/JONES-www-nomail"; }; // Paul Hartvigson zone "couchdesign.dk" { type master; allow-transfer { none; }; - file "/etc/local-JONES.DK/bind/fake-222/JONES-www+source+media"; }; // Jones + file "/etc/local-JONES.DK/bind/fake-222/couchdesign.dk"; }; // Jones zone "electrohype.dk" { type master; allow-transfer { none; }; file "/etc/local-JONES.DK/bind/fake-222/JONES-www-nomail"; }; // Maria Minard @@ -67,7 +67,7 @@ zone "oroefaellesjord.dk" { file "/etc/local-JONES.DK/bind/fake-222/TEENY-nomail"; }; // Orø Fællesjord zone "public-e.dk" { type master; allow-transfer { none; }; - file "/etc/local-JONES.DK/bind/fake-222/JONES-www+source+admin+media"; }; // Sara Gebran + file "/etc/local-JONES.DK/bind/fake-222/public-e.dk"; }; // Sara Gebran zone "redpill.dk" { type master; allow-transfer { none; }; file "/etc/local-JONES.DK/bind/fake-222/redpill.dk"; }; // Jones diff --git a/bind/named.conf.pri b/bind/named.conf.pri index cae7aef..c438101 100644 --- a/bind/named.conf.pri +++ b/bind/named.conf.pri @@ -31,7 +31,7 @@ zone "cityseeing.dk" { file "/etc/local-JONES.DK/bind/pri/JONES-www-nomail"; }; // Paul Hartvigson zone "couchdesign.dk" { type master; allow-transfer { jones_peers; }; - file "/etc/local-JONES.DK/bind/pri/JONES-www+source+media"; }; // Jones + file "/etc/local-JONES.DK/bind/pri/couchdesign.dk"; }; // Jones zone "electrohype.dk" { type master; allow-transfer { jones_peers; }; file "/etc/local-JONES.DK/bind/pri/JONES-www-nomail"; }; // Maria Minard @@ -65,7 +65,7 @@ zone "oroefaellesjord.dk" { file "/etc/local-JONES.DK/bind/pri/TEENY-nomail"; }; // Orø Fællesjord zone "public-e.dk" { type master; allow-transfer { jones_peers; }; - file "/etc/local-JONES.DK/bind/pri/JONES-www+source+admin+media"; }; // Sara Gebran + file "/etc/local-JONES.DK/bind/pri/public-e.dk"; }; // Sara Gebran zone "redpill.dk" { type master; allow-transfer { jones_peers; }; file "/etc/local-JONES.DK/bind/pri/redpill.dk"; }; // Jones diff --git a/bind/pri/JONES-www+source+admin+media b/bind/pri/JONES-www+source+admin+media deleted file mode 100644 index c76c2be..0000000 --- a/bind/pri/JONES-www+source+admin+media +++ /dev/null @@ -1,13 +0,0 @@ -$TTL 1h -@ SOA dns.jones.dk. dr.jones.dk. ( - 2020053101 - 4h 1h 1w 1h ) - -$INCLUDE /etc/local-JONES.DK/bind/skel/NS -$INCLUDE /etc/local-JONES.DK/bind/skel/A -$INCLUDE /etc/local-JONES.DK/bind/skel/MX - -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME admin -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media diff --git a/bind/pri/JONES-www+source+media b/bind/pri/JONES-www+source+media deleted file mode 100644 index a096a15..0000000 --- a/bind/pri/JONES-www+source+media +++ /dev/null @@ -1,12 +0,0 @@ -$TTL 1h -@ SOA dns.jones.dk. dr.jones.dk. ( - 2020053101 - 4h 1h 1w 1h ) - -$INCLUDE /etc/local-JONES.DK/bind/skel/NS -$INCLUDE /etc/local-JONES.DK/bind/skel/A -$INCLUDE /etc/local-JONES.DK/bind/skel/MX - -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www -$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media diff --git a/bind/pri/couchdesign.dk b/bind/pri/couchdesign.dk new file mode 100644 index 0000000..a096a15 --- /dev/null +++ b/bind/pri/couchdesign.dk @@ -0,0 +1,12 @@ +$TTL 1h +@ SOA dns.jones.dk. dr.jones.dk. ( + 2020053101 + 4h 1h 1w 1h ) + +$INCLUDE /etc/local-JONES.DK/bind/skel/NS +$INCLUDE /etc/local-JONES.DK/bind/skel/A +$INCLUDE /etc/local-JONES.DK/bind/skel/MX + +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media diff --git a/bind/pri/public-e.dk b/bind/pri/public-e.dk new file mode 100644 index 0000000..c76c2be --- /dev/null +++ b/bind/pri/public-e.dk @@ -0,0 +1,13 @@ +$TTL 1h +@ SOA dns.jones.dk. dr.jones.dk. ( + 2020053101 + 4h 1h 1w 1h ) + +$INCLUDE /etc/local-JONES.DK/bind/skel/NS +$INCLUDE /etc/local-JONES.DK/bind/skel/A +$INCLUDE /etc/local-JONES.DK/bind/skel/MX + +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME admin +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media -- cgit v1.2.3