From 2c2d9d4a9873b0e008520e5d017281b755d3c5c2 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 30 Oct 2021 10:30:39 +0200 Subject: replace morla.jones.dk by urgl.jones.dk, and generalize use of snippet CNAME-X-cloud --- bind/fake-222/biks.dk | 9 +++------ bind/fake-222/jones.dk | 19 +------------------ bind/fake-222/redpill.dk | 3 +-- bind/pri/biks.dk | 9 +++------ bind/pri/jones.dk | 19 +------------------ bind/pri/redpill.dk | 3 +-- bind/skel/A-cloud | 5 +++-- bind/skel/A-cloud2 | 3 --- bind/skel/CNAME-X-cloud | 4 ++-- bind/skel/CNAME-cloud | 2 +- 10 files changed, 16 insertions(+), 60 deletions(-) delete mode 100644 bind/skel/A-cloud2 diff --git a/bind/fake-222/biks.dk b/bind/fake-222/biks.dk index b5ebc71..bfea4fb 100644 --- a/bind/fake-222/biks.dk +++ b/bind/fake-222/biks.dk @@ -18,8 +18,7 @@ birgit CNAME coreander.jones.dk. boxer CNAME coreander.jones.dk. *.bsg CNAME coreander.jones.dk. bsg CNAME coreander.jones.dk. -*.media.bynu CNAME morla.jones.dk. -media.bynu CNAME morla.jones.dk. +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud media.bynu *.bynu CNAME xayide.jones.dk. bynu CNAME xayide.jones.dk. *.data CNAME coreander.jones.dk. @@ -41,8 +40,7 @@ jord CNAME graograman.jones.dk. kurt CNAME coreander.jones.dk. *.letsgo CNAME coreander.jones.dk. letsgo CNAME coreander.jones.dk. -*.media CNAME morla.jones.dk. -media CNAME morla.jones.dk. +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud numedia *.oroe CNAME coreander.jones.dk. oroe CNAME coreander.jones.dk. *.oroenyt CNAME coreander.jones.dk. @@ -53,8 +51,7 @@ press CNAME coreander.jones.dk. risan CNAME coreander.jones.dk. *.selvforsyning CNAME coreander.jones.dk. selvforsyning CNAME coreander.jones.dk. -*.siri CNAME morla.jones.dk. -siri CNAME morla.jones.dk. +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud siri *.spild CNAME coreander.jones.dk. spild CNAME coreander.jones.dk. *.sukker CNAME coreander.jones.dk. diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk index e615742..dc4fa90 100644 --- a/bind/fake-222/jones.dk +++ b/bind/fake-222/jones.dk @@ -253,24 +253,7 @@ perilin A 192.168.222.1 ;188.183.5.254; via xayide.jones.dk SSHFP 4 1 eb33d28d979e2a7f4ee37b7ed00e952a02248cfa SSHFP 4 2 1305bb2b86f85e03571af26e63132a0da15c48b9a24f90656ca569085e881778 -$INCLUDE JONES.DK/skel/A-cloud morla -$INCLUDE JONES.DK/skel/MX-avoid morla -morla HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux" - TXT "Desc=Server" - TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard" - TXT "ISP=Scaleway" - TXT "Link=T1" - TXT "CNAME=110-142-172-163.rev.cloud.scaleway.com." - SSHFP 1 1 9f8f7907b170425a02cf9ad7db394d1c4d329148 - SSHFP 1 2 34e50b99e03fe28c16bc3d6176604c1b0986b38f51370ffc1782deaff867a9e4 - SSHFP 2 1 5d4779074a1ea0e63c64df38aaf4034d4de158b2 - SSHFP 2 2 66b67051ed18a5dd6aa6ece54e7ea5b31e75515489eab9dbc419680d1457d978 - SSHFP 3 1 e453e058bc4fad25ab2ca9e4da86ee0236f7a900 - SSHFP 3 2 0485a0fd03c3e9b796cacaf914f9ee5e1ebc0620afe98d809ccd6dc91698a27e - SSHFP 4 1 f210f52835bbcc7a8f349cc24e23afa10d8b523a - SSHFP 4 2 18bdb49f1301624cb10da888344c2fe9058086d29628b93335d9d26c11acf602 - -$INCLUDE JONES.DK/skel/A-cloud2 urgl +$INCLUDE JONES.DK/skel/A-cloud urgl $INCLUDE JONES.DK/skel/MX-avoid urgl urgl HINFO "AMD EPYC 7281 (Scaleway STARDUST1-S)" "Debian GNU/Linux" TXT "Desc=Server" diff --git a/bind/fake-222/redpill.dk b/bind/fake-222/redpill.dk index 5e1e1c2..33fe079 100644 --- a/bind/fake-222/redpill.dk +++ b/bind/fake-222/redpill.dk @@ -11,8 +11,7 @@ data CNAME xayide.jones.dk. *.data CNAME xayide.jones.dk. source CNAME xayide.jones.dk. *.source CNAME xayide.jones.dk. -box CNAME morla.jones.dk. -*.box CNAME morla.jones.dk. +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud box $INCLUDE JONES.DK/skel/MX-avoid * * A 80.68.88.141 diff --git a/bind/pri/biks.dk b/bind/pri/biks.dk index 700ef05..29a89e3 100644 --- a/bind/pri/biks.dk +++ b/bind/pri/biks.dk @@ -18,8 +18,7 @@ birgit CNAME coreander.jones.dk. boxer CNAME coreander.jones.dk. *.bsg CNAME coreander.jones.dk. bsg CNAME coreander.jones.dk. -*.media.bynu CNAME morla.jones.dk. -media.bynu CNAME morla.jones.dk. +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud media.bynu *.bynu CNAME xayide.jones.dk. bynu CNAME xayide.jones.dk. *.data CNAME coreander.jones.dk. @@ -41,8 +40,7 @@ jord CNAME graograman.jones.dk. kurt CNAME coreander.jones.dk. *.letsgo CNAME coreander.jones.dk. letsgo CNAME coreander.jones.dk. -*.media CNAME morla.jones.dk. -media CNAME morla.jones.dk. +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud media *.oroe CNAME coreander.jones.dk. oroe CNAME coreander.jones.dk. *.oroenyt CNAME coreander.jones.dk. @@ -53,8 +51,7 @@ press CNAME coreander.jones.dk. risan CNAME coreander.jones.dk. *.selvforsyning CNAME coreander.jones.dk. selvforsyning CNAME coreander.jones.dk. -*.siri CNAME morla.jones.dk. -siri CNAME morla.jones.dk. +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud siri *.spild CNAME coreander.jones.dk. spild CNAME coreander.jones.dk. *.sukker CNAME coreander.jones.dk. diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk index 57c58b3..f3b925b 100644 --- a/bind/pri/jones.dk +++ b/bind/pri/jones.dk @@ -245,24 +245,7 @@ perilin HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux" SSHFP 4 1 eb33d28d979e2a7f4ee37b7ed00e952a02248cfa SSHFP 4 2 1305bb2b86f85e03571af26e63132a0da15c48b9a24f90656ca569085e881778 -$INCLUDE JONES.DK/skel/A-cloud morla -$INCLUDE JONES.DK/skel/MX-avoid morla -morla HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux" - TXT "Desc=Server" - TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard" - TXT "ISP=Scaleway" - TXT "Link=T1" - TXT "CNAME=110-142-172-163.rev.cloud.scaleway.com." - SSHFP 1 1 9f8f7907b170425a02cf9ad7db394d1c4d329148 - SSHFP 1 2 34e50b99e03fe28c16bc3d6176604c1b0986b38f51370ffc1782deaff867a9e4 - SSHFP 2 1 5d4779074a1ea0e63c64df38aaf4034d4de158b2 - SSHFP 2 2 66b67051ed18a5dd6aa6ece54e7ea5b31e75515489eab9dbc419680d1457d978 - SSHFP 3 1 e453e058bc4fad25ab2ca9e4da86ee0236f7a900 - SSHFP 3 2 0485a0fd03c3e9b796cacaf914f9ee5e1ebc0620afe98d809ccd6dc91698a27e - SSHFP 4 1 f210f52835bbcc7a8f349cc24e23afa10d8b523a - SSHFP 4 2 18bdb49f1301624cb10da888344c2fe9058086d29628b93335d9d26c11acf602 - -$INCLUDE JONES.DK/skel/A-cloud2 urgl +$INCLUDE JONES.DK/skel/A-cloud urgl $INCLUDE JONES.DK/skel/MX-avoid urgl urgl HINFO "AMD EPYC 7281 (Scaleway STARDUST1-S)" "Debian GNU/Linux" TXT "Desc=Server" diff --git a/bind/pri/redpill.dk b/bind/pri/redpill.dk index e7e4ff5..1cefd43 100644 --- a/bind/pri/redpill.dk +++ b/bind/pri/redpill.dk @@ -11,8 +11,7 @@ data CNAME xayide.jones.dk. *.data CNAME xayide.jones.dk. source CNAME xayide.jones.dk. *.source CNAME xayide.jones.dk. -box CNAME morla.jones.dk. -*.box CNAME morla.jones.dk. +$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud box $INCLUDE JONES.DK/skel/MX-avoid * * A 80.68.88.141 diff --git a/bind/skel/A-cloud b/bind/skel/A-cloud index 4fc8840..7e39cd5 100644 --- a/bind/skel/A-cloud +++ b/bind/skel/A-cloud @@ -1,2 +1,3 @@ -@ A 163.172.142.110 -@ TXT "Addr=France" +@ A 51.15.67.103 +@ AAAA fe80::dc2e:4cff:fe0c:a046 +@ TXT "Addr=Netherlands" diff --git a/bind/skel/A-cloud2 b/bind/skel/A-cloud2 deleted file mode 100644 index 7e39cd5..0000000 --- a/bind/skel/A-cloud2 +++ /dev/null @@ -1,3 +0,0 @@ -@ A 51.15.67.103 -@ AAAA fe80::dc2e:4cff:fe0c:a046 -@ TXT "Addr=Netherlands" diff --git a/bind/skel/CNAME-X-cloud b/bind/skel/CNAME-X-cloud index 346414e..3fea8da 100644 --- a/bind/skel/CNAME-X-cloud +++ b/bind/skel/CNAME-X-cloud @@ -1,2 +1,2 @@ -@ CNAME morla.jones.dk. -* CNAME morla.jones.dk. +@ CNAME urgl.jones.dk. +* CNAME urgl.jones.dk. diff --git a/bind/skel/CNAME-cloud b/bind/skel/CNAME-cloud index 1abb821..ac3a33f 100644 --- a/bind/skel/CNAME-cloud +++ b/bind/skel/CNAME-cloud @@ -1 +1 @@ -@ CNAME morla.jones.dk. +@ CNAME urgl.jones.dk. -- cgit v1.2.3