From ea807665eb2df383cc77818f39761e4a54cb3bdd Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Sun, 18 Aug 2019 14:15:30 -0400 Subject: [PATCH] change to use ns1.tildeverse.net --- db.chat.tilde | 24 ------------------------ db.ci.tilde | 22 ---------------------- db.git.tilde | 22 ---------------------- db.lists.tilde | 23 ----------------------- db.mastodon.tilde | 22 ---------------------- db.news.tilde | 22 ---------------------- db.pleroma.tilde | 22 ---------------------- db.team.tilde | 28 ---------------------------- named.conf | 3 ++- named.conf.local | 35 ----------------------------------- named.conf.team | 40 ++++++++++++++++++++++++++++++++++++++++ 11 files changed, 42 insertions(+), 221 deletions(-) delete mode 100644 db.chat.tilde delete mode 100644 db.ci.tilde delete mode 100644 db.git.tilde delete mode 100644 db.lists.tilde delete mode 100644 db.mastodon.tilde delete mode 100644 db.news.tilde delete mode 100644 db.pleroma.tilde delete mode 100644 db.team.tilde create mode 100644 named.conf.team diff --git a/db.chat.tilde b/db.chat.tilde deleted file mode 100644 index c879fc62..00000000 --- a/db.chat.tilde +++ /dev/null @@ -1,24 +0,0 @@ -; -; BIND data file for team.tilde -; -$TTL 604802 -@ IN SOA chat.tilde. root.chat.tilde. ( - 2019030203 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL -; - IN NS ns1.master.tilde. - IN NS ns2.master.tilde. - IN NS ns5.master.tilde. - -@ IN A 167.114.155.188 -irc IN A 51.79.32.48 -irc IN A 71.19.146.164 -irc IN A 104.225.221.249 -irc IN A 142.44.251.173 -irc IN A 172.93.50.135 -irc IN A 104.238.186.103 -irc IN A 116.203.17.87 -irc IN A 149.28.186.154 diff --git a/db.ci.tilde b/db.ci.tilde deleted file mode 100644 index d9bf8e63..00000000 --- a/db.ci.tilde +++ /dev/null @@ -1,22 +0,0 @@ -; -; BIND data file for ci.tilde -; -$TTL 604802 -@ IN SOA ci.tilde. root.team.tilde. ( - 2018112205 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL - IN A 51.79.32.48 -; - - IN NS ns1.master.tilde. - IN NS ns2.master.tilde. - IN NS ns5.master.tilde. - -@ IN A 51.79.32.48 -* IN A 51.79.32.48 -@ IN AAAA 2607:5300:60:823f::48 -* IN AAAA 2607:5300:60:823f::48 -@ IN MX 10 mail.tilde.team. diff --git a/db.git.tilde b/db.git.tilde deleted file mode 100644 index 94456eeb..00000000 --- a/db.git.tilde +++ /dev/null @@ -1,22 +0,0 @@ -; -; BIND data file for git.tilde -; -$TTL 604802 -@ IN SOA git.tilde. root.team.tilde. ( - 2018112205 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL - IN A 51.79.32.48 -; - - IN NS ns1.master.tilde. - IN NS ns2.master.tilde. - IN NS ns5.master.tilde. - -@ IN A 51.79.32.48 -* IN A 51.79.32.48 -@ IN AAAA 2607:5300:60:823f::48 -* IN AAAA 2607:5300:60:823f::48 -@ IN MX 10 mail.tilde.team. diff --git a/db.lists.tilde b/db.lists.tilde deleted file mode 100644 index ad92465c..00000000 --- a/db.lists.tilde +++ /dev/null @@ -1,23 +0,0 @@ -; -; BIND data file for team.tilde -; -$TTL 604802 -@ IN SOA lists.tilde. root.team.tilde. ( - 2018112205 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL - IN A 51.79.32.48 -; - - IN NS ns1.master.tilde. - IN NS ns2.master.tilde. - IN NS ns5.master.tilde. - -@ IN A 51.79.32.48 -* IN A 51.79.32.48 -ssh IN A 195.201.242.2 -@ IN AAAA 2607:5300:60:823f::48 -* IN AAAA 2607:5300:60:823f::48 -@ IN MX 10 mail.tilde.team. diff --git a/db.mastodon.tilde b/db.mastodon.tilde deleted file mode 100644 index 6eea3a0f..00000000 --- a/db.mastodon.tilde +++ /dev/null @@ -1,22 +0,0 @@ -; -; BIND data file for mastodon.tilde -; -$TTL 604802 -@ IN SOA mastodon.tilde. root.team.tilde. ( - 2018112205 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL - IN A 51.79.32.48 -; - - IN NS ns1.master.tilde. - IN NS ns2.master.tilde. - IN NS ns5.master.tilde. - -@ IN A 51.79.32.48 -* IN A 51.79.32.48 -@ IN AAAA 2607:5300:60:823f::48 -* IN AAAA 2607:5300:60:823f::48 -@ IN MX 10 mail.tilde.team. diff --git a/db.news.tilde b/db.news.tilde deleted file mode 100644 index 578d6a97..00000000 --- a/db.news.tilde +++ /dev/null @@ -1,22 +0,0 @@ -; -; BIND data file for news.tilde -; -$TTL 604802 -@ IN SOA news.tilde. root.team.tilde. ( - 2018112205 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL - IN A 51.79.32.48 -; - - IN NS ns1.master.tilde. - IN NS ns2.master.tilde. - IN NS ns5.master.tilde. - -@ IN A 51.79.32.48 -* IN A 51.79.32.48 -@ IN AAAA 2607:5300:60:823f::48 -* IN AAAA 2607:5300:60:823f::48 -@ IN MX 10 mail.tilde.team. diff --git a/db.pleroma.tilde b/db.pleroma.tilde deleted file mode 100644 index abf76f7a..00000000 --- a/db.pleroma.tilde +++ /dev/null @@ -1,22 +0,0 @@ -; -; BIND data file for pleroma.tilde -; -$TTL 604802 -@ IN SOA pleroma.tilde. root.team.tilde. ( - 2018112205 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL - IN A 51.79.32.48 -; - - IN NS ns1.master.tilde. - IN NS ns2.master.tilde. - IN NS ns5.master.tilde. - -@ IN A 51.79.32.48 -* IN A 51.79.32.48 -@ IN AAAA 2607:5300:60:823f::48 -* IN AAAA 2607:5300:60:823f::48 -@ IN MX 10 mail.tilde.team. diff --git a/db.team.tilde b/db.team.tilde deleted file mode 100644 index 5b12956e..00000000 --- a/db.team.tilde +++ /dev/null @@ -1,28 +0,0 @@ -; -; BIND data file for team.tilde -; -$TTL 604802 -@ IN SOA team.tilde. root.team.tilde. ( - 2018112205 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL - IN A 51.79.32.48 -; - - IN NS ns1.master.tilde. - IN NS ns2.master.tilde. - IN NS ns5.master.tilde. - -@ IN A 51.79.32.48 -* IN A 51.79.32.48 -ssh IN A 195.201.242.2 -bsd IN A 71.19.146.164 -*.bsd IN A 71.19.146.164 -@ IN AAAA 2607:5300:60:823f::48 -* IN AAAA 2607:5300:60:823f::48 -bsd IN AAAA 2605:2700:0:3:a800:ff:fe39:8028 -*.bsd IN AAAA 2605:2700:0:3:a800:ff:fe39:8028 -@ IN MX 10 mail.tilde.team. -bsd IN MX 10 bsd.tilde.team. diff --git a/named.conf b/named.conf index d0800462..2aefc56a 100644 --- a/named.conf +++ b/named.conf @@ -69,4 +69,5 @@ zone "." IN { include "/etc/named.rfc1912.zones"; include "/etc/named.root.key"; include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.opennic"; \ No newline at end of file +include "/etc/bind/named.conf.opennic"; +include "/etc/bind/named.conf.team"; diff --git a/named.conf.local b/named.conf.local index c5c8d066..287d7352 100644 --- a/named.conf.local +++ b/named.conf.local @@ -11,51 +11,16 @@ zone "master.tilde" { file "/etc/bind/db.master.tilde"; }; -zone "team.tilde" { - type master; - file "/etc/bind/db.team.tilde"; -}; - -zone "git.tilde" { - type master; - file "/etc/bind/db.git.tilde"; -}; - -zone "news.tilde" { - type master; - file "/etc/bind/db.news.tilde"; -}; - zone "nic.tilde" { type master; file "/etc/bind/db.nic.tilde"; }; -zone "ci.tilde" { - type master; - file "/etc/bind/db.ci.tilde"; -}; - -zone "mastodon.tilde" { - type master; - file "/etc/bind/db.mastodon.tilde"; -}; - -zone "pleroma.tilde" { - type master; - file "/etc/bind/db.pleroma.tilde"; -}; - zone "your.tilde" { type master; file "/etc/bind/db.your.tilde"; }; -zone "chat.tilde" { - type master; - file "/etc/bind/db.chat.tilde"; -}; - zone "cosmic.tilde" { type master; file "/etc/bind/db.cosmic.tilde"; diff --git a/named.conf.team b/named.conf.team new file mode 100644 index 00000000..6078afe0 --- /dev/null +++ b/named.conf.team @@ -0,0 +1,40 @@ +zone "team.tilde" { + type slave; + masters { 51.79.32.63; }; +}; + +zone "git.tilde" { + type slave; + masters { 51.79.32.63; }; +}; + +zone "news.tilde" { + type slave; + masters { 51.79.32.63; }; +}; + +zone "ci.tilde" { + type slave; + masters { 51.79.32.63; }; +}; + +zone "lists.tilde" { + type slave; + masters { 51.79.32.63; }; +}; + +zone "mastodon.tilde" { + type slave; + masters { 51.79.32.63; }; +}; + +zone "pleroma.tilde" { + type slave; + masters { 51.79.32.63; }; +}; + +zone "chat.tilde" { + type slave; + masters { 51.79.32.63; }; +}; +