diff --git a/db.chat.tilde b/db.chat.tilde deleted file mode 100644 index c879fc6..0000000 --- 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 d9bf8e6..0000000 --- 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 94456ee..0000000 --- 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 ad92465..0000000 --- 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 6eea3a0..0000000 --- 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 578d6a9..0000000 --- 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 abf76f7..0000000 --- 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 5b12956..0000000 --- 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 d080046..2aefc56 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 c5c8d06..287d735 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 0000000..6078afe --- /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; }; +}; +