summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2020-05-13 11:24:23 +0200
committerJonas Smedegaard <dr@jones.dk>2020-05-13 11:24:23 +0200
commitedd63bd2958bdc20068e56967f10674d15cec7a6 (patch)
tree4186545bde2ca005d93304d628cb0225d46c1e51
parentf66a3e1ea1922bec99b98b5417f215bb5960e519 (diff)
update domain birgitmaanestraale.dk: use mail.jones.dk (not mail.bitbase.dk)
-rw-r--r--bind/fake-222/birgitmaanestraale.dk15
-rw-r--r--bind/named.conf.fake-2222
-rw-r--r--bind/named.conf.pri2
-rw-r--r--bind/pri/birgitmaanestraale.dk15
4 files changed, 2 insertions, 32 deletions
diff --git a/bind/fake-222/birgitmaanestraale.dk b/bind/fake-222/birgitmaanestraale.dk
deleted file mode 100644
index a771991..0000000
--- a/bind/fake-222/birgitmaanestraale.dk
+++ /dev/null
@@ -1,15 +0,0 @@
-$TTL 1w
-@ IN SOA localhost. root.localhost. (
- 1
- 1w 1d 30d 3h )
-
-$INCLUDE /etc/local-JONES.DK/bind/skel/A-222
- NS localhost.
- MX 10 mail.bitbase.dk.
- MX 50 mail.jones.dk.
- MX 50 mail.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB"
-
-$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/named.conf.fake-222 b/bind/named.conf.fake-222
index cdb7ccd..02b3e83 100644
--- a/bind/named.conf.fake-222
+++ b/bind/named.conf.fake-222
@@ -15,7 +15,7 @@ zone "bassballs.dk" {
file "/etc/local-JONES.DK/bind/fake-222/JONES-www"; }; // Anders Krøyer
zone "birgitmaanestraale.dk" {
type master; allow-transfer { none; };
- file "/etc/local-JONES.DK/bind/fake-222/birgitmaanestraale.dk"; }; // Birgit Månestråle
+ file "/etc/local-JONES.DK/bind/fake-222/JONES-www"; }; // Birgit Månestråle
zone "byvandring.nu" {
type master; allow-transfer { none; };
file "/etc/local-JONES.DK/bind/fake-222/JONES-www"; }; // Paul Hartvigson
diff --git a/bind/named.conf.pri b/bind/named.conf.pri
index c556a00..bda1b9d 100644
--- a/bind/named.conf.pri
+++ b/bind/named.conf.pri
@@ -13,7 +13,7 @@ zone "bassballs.dk" {
file "/etc/local-JONES.DK/bind/pri/JONES-www"; }; // Anders Krøyer
zone "birgitmaanestraale.dk" {
type master; allow-transfer { jones_peers; };
- file "/etc/local-JONES.DK/bind/pri/birgitmaanestraale.dk"; }; // Birgit Månestråle
+ file "/etc/local-JONES.DK/bind/pri/JONES-www"; }; // Birgit Månestråle
zone "byvandring.nu" {
type master; allow-transfer { jones_peers; };
file "/etc/local-JONES.DK/bind/pri/JONES-www"; }; // Paul Hartvigson
diff --git a/bind/pri/birgitmaanestraale.dk b/bind/pri/birgitmaanestraale.dk
deleted file mode 100644
index b8bec82..0000000
--- a/bind/pri/birgitmaanestraale.dk
+++ /dev/null
@@ -1,15 +0,0 @@
-$TTL 1h
-@ SOA dns.jones.dk. dr.jones.dk. (
- 2019070801
- 1h 30m 1w 1h )
-
-$INCLUDE /etc/local-JONES.DK/bind/skel/NS
-$INCLUDE /etc/local-JONES.DK/bind/skel/A
- MX 10 mail.bitbase.dk.
- MX 50 mail.jones.dk.
- MX 50 mail.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB"
-
-$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www