Merge branch 'team-slave' of .tilde/.tilde into master

This commit is contained in:
ubergeek 2019-08-19 07:25:55 -04:00 committed by Gitea
commit 92508aecc2
11 changed files with 42 additions and 221 deletions

View File

@ -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

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -69,4 +69,5 @@ zone "." IN {
include "/etc/named.rfc1912.zones"; include "/etc/named.rfc1912.zones";
include "/etc/named.root.key"; include "/etc/named.root.key";
include "/etc/bind/named.conf.local"; include "/etc/bind/named.conf.local";
include "/etc/bind/named.conf.opennic"; include "/etc/bind/named.conf.opennic";
include "/etc/bind/named.conf.team";

View File

@ -11,51 +11,16 @@ zone "master.tilde" {
file "/etc/bind/db.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" { zone "nic.tilde" {
type master; type master;
file "/etc/bind/db.nic.tilde"; 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" { zone "your.tilde" {
type master; type master;
file "/etc/bind/db.your.tilde"; file "/etc/bind/db.your.tilde";
}; };
zone "chat.tilde" {
type master;
file "/etc/bind/db.chat.tilde";
};
zone "cosmic.tilde" { zone "cosmic.tilde" {
type master; type master;
file "/etc/bind/db.cosmic.tilde"; file "/etc/bind/db.cosmic.tilde";

40
named.conf.team Normal file
View File

@ -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; };
};