From bd11e4a2fc910579aa49b9245126398311f7a0e1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 20 Jun 2019 11:41:41 +0200 Subject: Merge REDPILL.DK pseudo-peer OROE.DK into JONES.DK. --- bind/named.conf.JONES.DK | 4 ++++ bind/named.conf.JONES.DK.internal | 4 ++++ bind/named.conf.OROE.DK | 4 ---- bind/named.conf.OROE.DK.internal | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 bind/named.conf.OROE.DK delete mode 100644 bind/named.conf.OROE.DK.internal (limited to 'bind') diff --git a/bind/named.conf.JONES.DK b/bind/named.conf.JONES.DK index b205a48..c6acc38 100644 --- a/bind/named.conf.JONES.DK +++ b/bind/named.conf.JONES.DK @@ -8,12 +8,16 @@ zone "feliciaweb.dk" { type slave; file "db.feliciaweb.dk"; masters { 188.183. zone "jones.dk" { type slave; file "db.jones.dk"; masters { 188.183.5.254; }; }; zone "kassandra-production.dk" { type slave; file "db.kassandra-production.dk"; masters { 188.183.5.254; }; }; zone "lejlighederinc.org" { type slave; file "db.lejlighederinc.org"; masters { 188.183.5.254; }; }; +zone "livetpaaoroe.dk" { type slave; file "db.livetpaaoroe.dk"; masters { 80.68.88.141; }; }; zone "majasguf.dk" { type slave; file "db.majasguf.dk"; masters { 188.183.5.254; }; }; zone "omni-presence.dk" { type slave; file "db.omni-presence.dk"; masters { 188.183.5.254; }; }; +zone "oroe.dk" { type slave; file "db.oroe.dk"; masters { 80.68.88.141; }; }; zone "public-e.dk" { type slave; file "db.public-e.dk"; masters { 188.183.5.254; }; }; zone "ressourceoptimering.dk" { type slave; file "db.ressourceoptimering.dk"; masters { 188.183.5.254; }; }; zone "scharffenberger.dk" { type slave; file "db.scharffenberger.dk"; masters { 188.183.5.254; }; }; zone "solidbox.org" { type slave; file "db.solidbox.org"; masters { 188.183.5.254; }; }; zone "stadsvandring.dk" { type slave; file "db.stadsvandring.dk"; masters { 188.183.5.254; }; }; zone "xn--abcdefghijklmnopqrstuvxyz-0fc0a81c.dk" { type slave; file "db.xn--abcdefghijklmnopqrstuvxyz-0fc0a81c.dk"; masters { 188.183.5.254; }; }; +zone "xn--livetpor-f0a6q.dk" { type slave; file "db.xn--livetpor-f0a6q.dk"; masters { 80.68.88.141; }; }; +zone "xn--or-mka.dk" { type slave; file "db.xn--or-mka.dk"; masters { 80.68.88.141; }; }; zone "xpositionreverse.org" { type slave; file "db.xpositionreverse.org"; masters { 188.183.5.254; }; }; diff --git a/bind/named.conf.JONES.DK.internal b/bind/named.conf.JONES.DK.internal index 429fb40..e08b55e 100644 --- a/bind/named.conf.JONES.DK.internal +++ b/bind/named.conf.JONES.DK.internal @@ -8,11 +8,15 @@ zone feliciaweb.dk { in-view internal; }; zone jones.dk { in-view internal; }; zone kassandra-production.dk { in-view internal; }; zone lejlighederinc.org { in-view internal; }; +zone livetpaaoroe.dk { in-view internal; }; zone majasguf.dk { in-view internal; }; zone omnipresence.dk { in-view internal; }; +zone oroe.dk { in-view internal; }; zone public-e.dk { in-view internal; }; zone ressourceoptimering.dk { in-view internal; }; zone scharffenberger.dk { in-view internal; }; zone stadsvandring.dk { in-view internal; }; zone xn--abcdefghijklmnopqrstuvxyz-0fc0a81c.dk { in-view internal; }; +zone xn--livetpor-f0a6q.dk { in-view internal; }; +zone xn--or-mka.dk { in-view internal; }; zone xpositionreverse.org { in-view internal; }; diff --git a/bind/named.conf.OROE.DK b/bind/named.conf.OROE.DK deleted file mode 100644 index fcba738..0000000 --- a/bind/named.conf.OROE.DK +++ /dev/null @@ -1,4 +0,0 @@ -zone "livetpaaoroe.dk" { type slave; file "db.livetpaaoroe.dk"; masters { 80.68.88.141; }; }; -zone "oroe.dk" { type slave; file "db.oroe.dk"; masters { 80.68.88.141; }; }; -zone "xn--or-mka.dk" { type slave; file "db.xn--or-mka.dk"; masters { 80.68.88.141; }; }; -zone "xn--livetpor-f0a6q.dk" { type slave; file "db.xn--livetpor-f0a6q.dk"; masters { 80.68.88.141; }; }; diff --git a/bind/named.conf.OROE.DK.internal b/bind/named.conf.OROE.DK.internal deleted file mode 100644 index d30f608..0000000 --- a/bind/named.conf.OROE.DK.internal +++ /dev/null @@ -1,4 +0,0 @@ -zone livetpaaoroe.dk { in-view internal; }; -zone oroe.dk { in-view internal; }; -zone xn--or-mka.dk { in-view internal; }; -zone xn--livetpor-f0a6q.dk { in-view internal; }; -- cgit v1.2.3