failover DNS to fishfinger

7 files changed, 59 insertions, 105 deletions

diff --git a/frontends/var/nsd/zones/master/buetow.org.zone.tpl b/frontends/var/nsd/zones/master/buetow.org.zone.tpl
index 2e12e8a..03b0de7 100644
--- a/frontends/var/nsd/zones/master/buetow.org.zone.tpl
+++ b/frontends/var/nsd/zones/master/buetow.org.zone.tpl
@@ -9,31 +9,41 @@ $TTL 4h
          IN NS    blowfish.buetow.org.
          IN NS    fishfinger.buetow.org.
 
+	 IN A <%= $ips->{current_master}{ipv4} %>
+         IN AAAA <%= $ips->{current_master}{ipv6} %>
+
+         IN MX 10 fishfinger.buetow.org.
+         IN MX 20 blowfish.buetow.org.
+
 cool     IN NS ns-75.awsdns-09.com.
 cool     IN NS ns-707.awsdns-24.net.
 cool     IN NS ns-1081.awsdns-07.org.
 cool     IN NS ns-1818.awsdns-35.co.uk.
-	
-         IN MX 10 blowfish.buetow.org.
-         IN MX 20 fishfinger.buetow.org.
-         1800 IN A 23.88.35.144
-         1800 IN AAAA 2a01:4f8:c17:20f1::42
 
-*        IN MX 10 blowfish.buetow.org.
-*        IN MX 20 fishfinger.buetow.org.
-*        1800 IN A 23.88.35.144
-*        1800 IN AAAA 2a01:4f8:c17:20f1::42
-@        1800 IN A 23.88.35.144
-@        1800 IN AAAA 2a01:4f8:c17:20f1::42
+www.paul     1800 IN CNAME <%= $ips->{current_master}{fqdn} %>.
+www.dory     1800 IN CNAME <%= $ips->{current_master}{fqdn} %>.
+www.solarcat 1800 IN CNAME <%= $ips->{current_master}{fqdn} %>.
+
+blowfish   14400 IN A 23.88.35.144
+blowfish   14400 IN AAAA 2a01:4f8:c17:20f1::42
+fishfinger 14400 IN A 46.23.94.99
+fishfinger 14400 IN AAAA 2a03:6000:6f67:624::99
 
-blowfish 86400 IN A 23.88.35.144
-blowfish 86400 IN AAAA 2a01:4f8:c17:20f1::42
-git1     1800 IN CNAME blowfish
-tmp      1800 IN CNAME blowfish
-dory     1800 IN CNAME blowfish
-fotos    1800 IN CNAME blowfish
-paul 1800 IN A 23.88.35.144
-paul 1800 IN AAAA 2a01:4f8:c17:20f1::42
+git1        1800 IN CNAME blowfish
+git2        1800 IN CNAME fishfinger
+
+mirror          1800 IN CNAME <%= $ips->{current_standby}{fqdn} %>.
+mirror.paul     1800 IN CNAME <%= $ips->{current_standby}{fqdn} %>.
+mirror.dory     1800 IN CNAME <%= $ips->{current_standby}{fqdn} %>.
+mirror.solarcat 1800 IN CNAME <%= $ips->{current_standby}{fqdn} %>.
+mirror.fotos    1800 IN CNAME <%= $ips->{current_standby}{fqdn} %>.
+
+zapad.sofia    14400 IN CNAME 79-100-3-54.ip.btc-net.bg.
+www2           14400 IN CNAME snonux.codeberg.page.
+	
+protonmail._domainkey.paul  IN CNAME protonmail.domainkey.d4xua2siwqfhvecokhuacmyn5fyaxmjk6q3hu2omv2z43zzkl73yq.domains.proton.ch.
+protonmail2._domainkey.paul IN CNAME protonmail2.domainkey.d4xua2siwqfhvecokhuacmyn5fyaxmjk6q3hu2omv2z43zzkl73yq.domains.proton.ch.
+protonmail3._domainkey.paul IN CNAME protonmail3.domainkey.d4xua2siwqfhvecokhuacmyn5fyaxmjk6q3hu2omv2z43zzkl73yq.domains.proton.ch.
 paul IN TXT protonmail-verification=a42447901e320064d13e536db4d73ce600d715b7
 paul IN TXT v=spf1 include:_spf.protonmail.ch mx ~all
 paul IN TXT v=DMARC1; p=none
@@ -41,25 +51,5 @@ paul IN MX 10 mail.protonmail.ch.
 paul IN MX 20 mailsec.protonmail.ch.
 paul IN MX 42 blowfish
 paul IN MX 42 fishfinger
-protonmail._domainkey.paul IN CNAME protonmail.domainkey.d4xua2siwqfhvecokhuacmyn5fyaxmjk6q3hu2omv2z43zzkl73yq.domains.proton.ch.
-protonmail2._domainkey.paul IN CNAME protonmail2.domainkey.d4xua2siwqfhvecokhuacmyn5fyaxmjk6q3hu2omv2z43zzkl73yq.domains.proton.ch.
-protonmail3._domainkey.paul IN CNAME protonmail3.domainkey.d4xua2siwqfhvecokhuacmyn5fyaxmjk6q3hu2omv2z43zzkl73yq.domains.proton.ch.
-
-fishfinger 86400 IN A 46.23.94.99
-fishfinger 86400 IN AAAA 2a03:6000:6f67:624::99
-git2       1800 IN CNAME fishfinger
-www        1800 IN CNAME fishfinger
-www.tmp    1800 IN CNAME fishfinger
-www.znc    1800 IN CNAME fishfinger
-bnc        1800 IN CNAME www.znc
-www.dory   1800 IN CNAME fishfinger
-www.fotos 1800 IN CNAME fishfinger
-www.paul   1800 IN CNAME fishfinger
-
-vulcan   86400 IN A 95.216.174.192
-vulcan   86400 IN AAAA 2a01:4f9:c010:250e::1
-vu       86400 IN CNAME vulcan
-edge     1800 IN CNAME vulcan
 
-zapad.sofia 86400 IN CNAME 79-100-3-54.ip.btc-net.bg.
-www2         1800 IN CNAME snonux.codeberg.page.
+*            1800 IN CNAME <%= $ips->{current_master}{fqdn} %>.
diff --git a/frontends/var/nsd/zones/master/dtail.dev.zone.tpl b/frontends/var/nsd/zones/master/dtail.dev.zone.tpl
index dea0f5d..a0005e9 100644
--- a/frontends/var/nsd/zones/master/dtail.dev.zone.tpl
+++ b/frontends/var/nsd/zones/master/dtail.dev.zone.tpl
@@ -6,12 +6,15 @@ $TTL 4h
                   30m             ; retry
                   7d              ; expire
                   1h )            ; negative
-         IN NS   blowfish.buetow.org.
          IN NS   fishfinger.buetow.org.
+         IN NS   blowfish.buetow.org.
+
+         IN MX 10 fishfinger.buetow.org.
+         IN MX 20 blowfish.buetow.org.
 
-         86400 IN A 23.88.35.144
-         86400 IN AAAA 2a01:4f8:c17:20f1::42
-*        86400 IN CNAME blowfish.buetow.org.
-www      86400 IN CNAME fishfinger.buetow.org.
+         1800 IN A <%= $ips->{current_master}{ipv4} %>
+         1800 IN AAAA <%= $ips->{current_master}{ipv6} %>
+*        1800 IN CNAME <%= $ips->{current_master}{fqdn} %>.
+mirror   1800 IN CNAME <%= $ips->{current_standby}{fqdn} %>.
 github   86400 IN CNAME mimecast.github.io.
 
diff --git a/frontends/var/nsd/zones/master/foo.zone.zone.tpl b/frontends/var/nsd/zones/master/foo.zone.zone.tpl
index 998ac2f..173bbd1 100644
--- a/frontends/var/nsd/zones/master/foo.zone.zone.tpl
+++ b/frontends/var/nsd/zones/master/foo.zone.zone.tpl
@@ -6,15 +6,13 @@ $TTL 4h
                   30m             ; retry
                   7d              ; expire
                   1h )            ; negative
-         IN NS   blowfish.buetow.org.
          IN NS   fishfinger.buetow.org.
+         IN NS   blowfish.buetow.org.
 
-         IN MX 10 blowfish.buetow.org.
-         IN MX 20 fishfinger.buetow.org.
+         IN MX 10 fishfinger.buetow.org.
+         IN MX 20 blowfish.buetow.org.
 
-         1800 IN A 23.88.35.144
-         1800 IN AAAA 2a01:4f8:c17:20f1::42
-*        1800 IN CNAME blowfish.buetow.org.
-www      1800 IN CNAME fishfinger.buetow.org.
-www.tmp  1800 IN CNAME fishfinger.buetow.org.
-codeberg 1800 IN CNAME snonux.codeberg.page.
+         1800 IN A <%= $ips->{current_master}{ipv4} %>
+         1800 IN AAAA <%= $ips->{current_master}{ipv6} %>
+*        1800 IN CNAME <%= $ips->{current_master}{fqdn} %>.
+mirror   1800 IN CNAME <%= $ips->{current_standby}{fqdn} %>.
diff --git a/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl b/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl
index 8454cc3..6157bd4 100644
--- a/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl
+++ b/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl
@@ -6,13 +6,13 @@ $TTL 4h
                   30m             ; retry
                   7d              ; expire
                   1h )            ; negative
-         IN NS   blowfish.buetow.org.
          IN NS   fishfinger.buetow.org.
+         IN NS   blowfish.buetow.org.
 
-         IN MX 10 blowfish.buetow.org.
-         IN MX 20 fishfinger.buetow.org.
+         IN MX 10 fishfinger.buetow.org.
+         IN MX 20 blowfish.buetow.org.
 
-         1800 IN A 23.88.35.144
-         1800 IN AAAA 2a01:4f8:c17:20f1::42
-*        1800 IN CNAME blowfish.buetow.org.
-www      1800 IN CNAME fishfinger.buetow.org.
+         1800 IN A <%= $ips->{current_master}{ipv4} %>
+         1800 IN AAAA <%= $ips->{current_master}{ipv6} %>
+*        1800 IN CNAME <%= $ips->{current_master}{fqdn} %>.
+mirror   1800 IN CNAME <%= $ips->{current_standby}{fqdn} %>.
diff --git a/frontends/var/nsd/zones/master/paul.cyou.zone.tpl b/frontends/var/nsd/zones/master/paul.cyou.zone.tpl
deleted file mode 100644
index f5b46f2..0000000
--- a/frontends/var/nsd/zones/master/paul.cyou.zone.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-$ORIGIN paul.cyou.
-$TTL 4h
-@        IN  SOA  blowfish.buetow.org. hostmaster.buetow.org. (
-                  <%= time() %>   ; serial
-                  1h              ; refresh
-                  30m             ; retry
-                  7d              ; expire
-                  1h )            ; negative
-         IN NS   blowfish.buetow.org.
-         IN NS   fishfinger.buetow.org.
-         IN TXT  da9a0a283c847df507efd4cd9c5332aa766e1ed6
-
-         IN MX 10 blowfish.buetow.org.
-         IN MX 20 fishfinger.buetow.org.
-
-         1800 IN A 23.88.35.144
-         1800 IN AAAA 2a01:4f8:c17:20f1::42
-*        1800 IN CNAME blowfish.buetow.org.
-www      1800 IN CNAME fishfinger.buetow.org.
diff --git a/frontends/var/nsd/zones/master/snonux.foo.zone.tpl b/frontends/var/nsd/zones/master/snonux.foo.zone.tpl
index b057f20..e765cbe 100644
--- a/frontends/var/nsd/zones/master/snonux.foo.zone.tpl
+++ b/frontends/var/nsd/zones/master/snonux.foo.zone.tpl
@@ -6,13 +6,13 @@ $TTL 4h
                   30m             ; retry
                   7d              ; expire
                   1h )            ; negative
-         IN NS   blowfish.buetow.org.
          IN NS   fishfinger.buetow.org.
+         IN NS   blowfish.buetow.org.
 
-         IN MX 10 blowfish.buetow.org.
-         IN MX 20 fishfinger.buetow.org.
+         IN MX 10 fishfinger.buetow.org.
+         IN MX 20 blowfish.buetow.org.
 
-         1800 IN A 23.88.35.144
-         1800 IN AAAA 2a01:4f8:c17:20f1::42
-*        1800 IN CNAME blowfish.buetow.org.
-www      1800 IN CNAME fishfinger.buetow.org.
+         1800 IN A <%= $ips->{current_master}{ipv4} %>
+         1800 IN AAAA <%= $ips->{current_master}{ipv6} %>
+*        1800 IN CNAME <%= $ips->{current_master}{fqdn} %>.
+mirror   1800 IN CNAME <%= $ips->{current_standby}{fqdn} %>.
diff --git a/frontends/var/nsd/zones/master/snonux.land.zone.tpl b/frontends/var/nsd/zones/master/snonux.land.zone.tpl
deleted file mode 100644
index 8e4fe80..0000000
--- a/frontends/var/nsd/zones/master/snonux.land.zone.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-$ORIGIN snonux.land.
-$TTL 4h
-@        IN  SOA  blowfish.buetow.org. hostmaster.buetow.org. (
-                  <%= time() %>   ; serial
-                  1h              ; refresh
-                  30m             ; retry
-                  7d              ; expire
-                  1h )            ; negative
-         IN NS   blowfish.buetow.org.
-         IN NS   fishfinger.buetow.org.
-
-         IN MX 10 blowfish.buetow.org.
-         IN MX 20 fishfinger.buetow.org.
-
-         1800 IN A 23.88.35.144
-         1800 IN AAAA 2a01:4f8:c17:20f1::42
-*        1800 IN CNAME blowfish.buetow.org.
-www      1800 IN CNAME fishfinger.buetow.org.