Revert "Remove IPv4 except for DNS and NFS. Also remove 2 old records."

This reverts commit 92939a6f84fc2eecd34144b1fe8f5fb092f61721.

5 files changed, 69 insertions, 1 deletions

diff --git a/roles/dnsserver/files/admin.casperlefantom.net.zone b/roles/dnsserver/files/admin.casperlefantom.net.zone
index 962f6b3..135297c 100644
--- a/roles/dnsserver/files/admin.casperlefantom.net.zone
+++ b/roles/dnsserver/files/admin.casperlefantom.net.zone
@@ -12,12 +12,14 @@ admin.casperlefantom.net. IN SOA nse.admin.casperlefantom.net. hostmaster.casper
 @ IN NS nse.admin.casperlefantom.net.
 @ IN NS nsf.admin.casperlefantom.net.
 
+@ IN A 51.15.177.140
 @ IN AAAA 2001:bc8:3fec:500:7ea::
 @ IN TXT "v=spf1 redirect=casperlefantom.net"
 @ IN CAA 0 issue "letsencrypt.org"
 @ IN CAA 0 issue "Matthieu Saulnier Root CA"
 @ IN CAA 0 issuewild "Matthieu Saulnier Root CA"
 
+blackbird IN A 82.65.125.114
 blackbird IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 * IN CNAME blackbird
 
@@ -49,29 +51,40 @@ nsh IN A 51.158.147.50
 nsh IN AAAA 2001:bc8:2db9:100::53
 
 
+manchester IN A 82.65.125.114
 manchester IN AAAA 2a01:e0a:473:35e0::fed0:a:1
 
+sd-126263 IN A 51.15.167.85
 sd-126263 IN AAAA 2001:bc8:3fec:d00:1eaf::
 111281hpv002079 IN CNAME sd-126263
 frhb11858flex IN CNAME sd-126263
 
+frhb11859flex IN A 109.238.2.40
 frhb11859flex IN AAAA 2a00:c70:1:109:238:2:40:bad
 vps128389 IN CNAME frhb11859flex
 
+sd-128718 IN A 51.15.177.140
 sd-128718 IN AAAA 2001:bc8:3fec:500:7ea::
 sd-129211 IN CNAME sd-128718
 
+sd-94125 IN A 163.172.211.128
 sd-94125 IN AAAA 2001:bc8:3fec:b00:b007::
 
 
+bt1 IN A 82.65.125.114
 bt1 IN AAAA 2a01:e0a:473:35e0::fed0:a:1
 
+bt2 IN A 51.15.177.140
 bt2 IN AAAA 2001:bc8:3fec:500:7ea::
 
+bt3 IN A 163.172.211.128
 bt3 IN AAAA 2001:bc8:3fec:b00:b007::
 
+bt4 IN A 82.65.125.114
 bt4 IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 
+bt5 IN A 82.65.125.114
 bt5 IN AAAA 2a01:e0a:473:35e0::fed0:a:12
 
+erp IN A 51.15.177.140
 erp IN AAAA 2001:bc8:3fec:500:7ea::
diff --git a/roles/dnsserver/files/casperlefantom.net.zone b/roles/dnsserver/files/casperlefantom.net.zone
index dfec71e..14d27ea 100644
--- a/roles/dnsserver/files/casperlefantom.net.zone
+++ b/roles/dnsserver/files/casperlefantom.net.zone
@@ -41,6 +41,7 @@ vpn IN NS nsf.vpn.casperlefantom.net.
 
 @ IN MX 30 mx1.casperlefantom.net.
 @ IN MX 40 mx2.casperlefantom.net.
+@ IN A 51.15.177.140
 @ IN AAAA 2001:bc8:3fec:500:7ea::
 _443._tcp IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 @ IN TXT "v=spf1 mx mx:casperlefantom.net mx:saulnier.im -all"
@@ -121,6 +122,7 @@ nsh.tor-exit IN A 51.158.147.50
 nsh.tor-exit IN AAAA 2001:bc8:2db9:100::53
 
 
+www IN A 51.15.177.140
 www IN AAAA 2001:bc8:3fec:500:7ea::
 _443._tcp.www IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 
@@ -217,6 +219,7 @@ gw1 IN A 82.65.125.114
 gw1 IN AAAA 2a01:e0a:473:35e0::1
 
 
+blackbird IN A 82.65.125.114
 blackbird IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 blackbird IN TXT "vnjq7zmcmxwpxurw5imchrwbzcgyox4jwrkmpbkcb3zushy5m46566id.onion"
 
@@ -231,6 +234,7 @@ b4e8e0047b36cf1fa76e5c61091d8a479227d81c IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 b4e8e0047b36cf1fa76e5c61091d8a479227d81c IN TXT we-run-this-tor-relay
 
 
+mail IN A 82.65.125.114
 mail IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 mail IN TXT "v=spf1 a a:mail.casperlefantom.net ip4:82.65.125.114 ip6:2a01:e0a:473:35e0::fed0:a:7 -all"
 _25._tcp.mail IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
@@ -238,6 +242,7 @@ _587._tcp.mail IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c
 _143._tcp.mail IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 _993._tcp.mail IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 
+mx1 IN A 82.65.125.114
 mx1 IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 mx1 IN TXT "v=spf1 a a:mx1.casperlefantom.net ip4:82.65.125.114 ip6:2a01:e0a:473:35e0::fed0:a:7 -all"
 _25._tcp.mx1 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
@@ -245,6 +250,7 @@ _587._tcp.mx1 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6
 _143._tcp.mx1 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 _993._tcp.mx1 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 
+mx2 IN A 163.172.211.128
 mx2 IN AAAA 2001:bc8:3fec:b00:b007::
 mx2 IN TXT "v=spf1 a a:mx2.casperlefantom.net ip4:163.172.211.128 ip6:2001:bc8:3fec:b00:b007:: -all"
 _25._tcp.mx2 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
@@ -252,6 +258,8 @@ _587._tcp.mx2 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6
 _143._tcp.mx2 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 _993._tcp.mx2 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 
+smtp IN A 82.65.125.114
+smtp IN A 163.172.211.128
 smtp IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 smtp IN AAAA 2001:bc8:3fec:b00:b007::
 smtp1 IN CNAME mx1
@@ -280,9 +288,11 @@ _143._tcp.imap2 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382
 _993._tcp.imap2 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 
 
+voip IN A 82.65.125.114
 voip IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 voip1 IN CNAME voip
 
+voip2 IN A 51.15.167.85
 voip2 IN AAAA 2001:bc8:3fec:d00:1eaf::
 
 _mumble._tcp IN SRV 5 0 64738 voip.casperlefantom.net.
@@ -292,6 +302,7 @@ _64738._tcp.voip IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b9338
 _64738._tcp.voip1 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 _64738._tcp.voip2 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 
+stream IN A 82.65.125.114
 stream IN AAAA 2a01:e0a:473:35e0::fed0:a:12
 
 
@@ -305,21 +316,30 @@ nfs3 IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 nfs3-ipv6 IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 nfs3-freeway IN CNAME nfs3-ipv6
 
+nfs4 IN A 82.65.125.114
+nfs4 IN AAAA 2a01:e0a:473:35e0::fed0:a:12
+nfs4-ipv6 IN AAAA 2a01:e0a:473:35e0::fed0:a:12
+nfs4-freeway IN CNAME nfs4-ipv6
+
 _matrix._tcp IN SRV 5 0 8448 matrix.saulnier.im.
 
+dl IN A 51.15.177.140
 dl IN AAAA 2001:bc8:3fec:500:7ea::
 dl IN TXT "uhxfe4e6yc72i6fhexcpk4ph4niueexpy4ckc3wapazxqhv4isejbnyd.onion"
 _443._tcp.dl IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 
 
+mirror IN A 82.65.125.114
 mirror IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 _4433._tcp.mirror IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93382c6e625769f8e04
 
+mirror-2 IN A 51.15.177.140
 mirror-2 IN AAAA 2001:bc8:3fec:500:7ea::
 mirror-2 IN TXT "qsi7j4gwqzb7tfqq7t4h7x67j2hcxlybxqksesod7tfjntvbvyoj6zqd.onion"
 _443._tcp.mirror-2 IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 
 
+jabber IN A 82.65.125.114
 jabber IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 jabber1 IN CNAME jabber
 im IN CNAME jabber
@@ -327,20 +347,27 @@ im1 IN CNAME jabber
 xmpp IN CNAME jabber
 xmpp1 IN CNAME jabber
 
+jabber2 IN A 51.15.167.85
 jabber2 IN AAAA 2001:bc8:3fec:d00:1eaf::
 im2 IN CNAME jabber2
 xmpp2 IN CNAME jabber2
 
+conference IN A 82.65.125.114
 conference IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 pubsub1 IN CNAME conference
 
+rooms IN A 51.15.167.85
 rooms IN AAAA 2001:bc8:3fec:d00:1eaf::
 pubsub2 IN CNAME rooms
 
+stun1 IN A 82.65.125.114
 stun1 IN AAAA 2a01:e0a:473:35e0::fed0:a:7
+stun2 IN A 51.15.167.85
 stun2 IN AAAA 2001:bc8:3fec:d00:1eaf::
 
+turn1 IN A 82.65.125.114
 turn1 IN AAAA 2a01:e0a:473:35e0::fed0:a:7
+turn2 IN A 51.15.167.85
 turn2 IN AAAA 2001:bc8:3fec:d00:1eaf::
 
 _xmpp-client._tcp IN SRV 5 0 5222 jabber.casperlefantom.net.
@@ -385,15 +412,19 @@ _5269._tcp.pubsub2 IN TLSA 2 0 1 c36b2e72879ef73db54fda155db52977a6c8026e5225b93
 _xmppconnect IN TXT "_xmpp-client-xbosh=https://io.casperlefantom.net/http-bind/ejabberd"
 _xmppconnect IN TXT "_xmpp-client-websocket=wss://io.casperlefantom.net/websocket/ws"
 
+chat IN A 51.15.177.140
 chat IN AAAA 2001:bc8:3fec:500:7ea::
 _443._tcp.chat IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 
+service-secret IN A 51.15.177.140
 service-secret IN AAAA 2001:bc8:3fec:500:7ea::
 _443._tcp.service-secret IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 
+io IN A 51.15.177.140
 io IN AAAA 2001:bc8:3fec:500:7ea::
 _443._tcp.io IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 
+search IN A 51.15.177.140
 search IN AAAA 2001:bc8:3fec:500:7ea::
 _443._tcp.search IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 
@@ -407,6 +438,7 @@ nsb IN AAAA 2001:bc8:3fec:d00:1eaf::
 nsb IN TXT "hzjexvat7cebtabc65p63s6faa44k4u2iqpdrv5yl3pbvjopylqlncyd.onion"
 nsb IN SSHFP 4 2 37ee15f74974388c32aded32c2b4a9026f9f15ca2ba4020624f0d5ab3b57776e
 
+sd-126263 IN A 51.15.167.85
 sd-126263 IN AAAA 2001:bc8:3fec:d00:1eaf::
 sd-126263 IN TXT "hzjexvat7cebtabc65p63s6faa44k4u2iqpdrv5yl3pbvjopylqlncyd.onion"
 
@@ -420,6 +452,7 @@ db-cirrus2 IN AAAA 2001:bc8:3fec:d00:1eaf::
 redis IN AAAA 2001:bc8:3fec:d00:1eaf::
 redis1 IN CNAME redis
 
+tor-bridge IN A 51.15.167.85
 tor-bridge IN AAAA 2001:bc8:3fec:d00:1eaf::
 
 336574a3d63fb4a6cd5a6c8c8289f0ff5eaecae3 IN A 51.15.167.85
@@ -437,6 +470,7 @@ nsd IN AAAA 2001:bc8:3fec:500:7ea::
 nsd IN TXT "vkq2cezexdlccukhpa2scxxv35rkb6a2abuknrom5h72g2gncjj4ybqd.onion"
 nsd IN SSHFP 4 2 192f2342e4b52d4b035d971a774621800758aa5d509b0c62476f4da56cbadcb2
 
+sd-128718 IN A 51.15.177.140
 sd-128718 IN AAAA 2001:bc8:3fec:500:7ea::
 sd-128718 IN TXT "vkq2cezexdlccukhpa2scxxv35rkb6a2abuknrom5h72g2gncjj4ybqd.onion"
 sd-129211 IN CNAME sd-128718
@@ -451,11 +485,17 @@ e066039f496ff251017641579a914cba4d4c8654 IN TXT we-run-this-tor-relay
 
 
 
+cirrus IN A 51.15.177.140
 cirrus IN AAAA 2001:bc8:3fec:500:7ea::
 cirrus IN TXT "hr5nvn34wxtvzkipwsk53u5wo2thqrkmh7sp4f2wcbs664ekqsk5dkqd.onion"
 _443._tcp.cirrus IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 
-status-fo IN AAAA 2001:bc8:3fec:500:7ea::
+interpouet IN A 51.15.177.140
+interpouet IN AAAA 2001:bc8:3fec:500:7ea::
+interpouet IN TXT "5uo2w5mqz2cftf7g3wuba4ucac2l62akqbi45emrhfz5mrjfj34mjyid.onion"
+_443._tcp.interpouet IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
+
+status-fo IN CNAME stats.uptimerobot.com.
 _443._tcp.status-fo IN TLSA 2 0 1 67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd
 
 
@@ -468,9 +508,11 @@ nse IN AAAA 2001:bc8:3fec:b00:b007::
 nse IN TXT "5v6qzojtp2r4sxqax42yyc4npjzg2ihguxqtqq7y3ykc6uf53fxcfzad.onion"
 nse IN SSHFP 4 2 6086b5a718ccb71156ad06b9e6e7b667efa3cc0c4650c9dd25de79546cc83e10
 
+sd-94125 IN A 163.172.211.128
 sd-94125 IN AAAA 2001:bc8:3fec:b00:b007::
 sd-94125 IN TXT "5v6qzojtp2r4sxqax42yyc4npjzg2ihguxqtqq7y3ykc6uf53fxcfzad.onion"
 
+axfr IN A 163.172.211.128
 axfr IN AAAA 2001:bc8:3fec:b00:b007::
 
 241ed37b98e822f328b8d883ef8eca3adab0ee12 IN A 163.172.211.128
diff --git a/roles/dnsserver/files/ntp.casperlefantom.net.zone b/roles/dnsserver/files/ntp.casperlefantom.net.zone
index 1517e4b..14afeb1 100644
--- a/roles/dnsserver/files/ntp.casperlefantom.net.zone
+++ b/roles/dnsserver/files/ntp.casperlefantom.net.zone
@@ -12,9 +12,11 @@ ntp.casperlefantom.net. IN SOA nse.ntp.casperlefantom.net. hostmaster.casperlefa
 @ IN NS nse.ntp.casperlefantom.net.
 @ IN NS nsf.ntp.casperlefantom.net.
 
+@ IN A 82.65.125.114
 @ IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 @ IN TXT "v=spf1 redirect=casperlefantom.net"
 
+blackbird IN A 82.65.125.114
 blackbird IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 * IN CNAME blackbird
 
@@ -46,11 +48,15 @@ nsh IN A 51.158.147.50
 nsh IN AAAA 2001:bc8:2db9:100::53
 
 
+chrono1 IN A 82.65.125.114
 chrono1 IN AAAA 2a01:e0a:473:35e0::fed0:a:7
 
+chrono2 IN A 51.15.167.85
 chrono2 IN AAAA 2001:bc8:3fec:d00:1eaf::
 
 
+chrono4 IN A 51.15.177.140
 chrono4 IN AAAA 2001:bc8:3fec:500:7ea::
 
+chrono5 IN A 163.172.211.128
 chrono5 IN AAAA 2001:bc8:3fec:b00:b007::
diff --git a/roles/dnsserver/files/tor-exit.casperlefantom.net.zone b/roles/dnsserver/files/tor-exit.casperlefantom.net.zone
index d87b64b..4939b59 100644
--- a/roles/dnsserver/files/tor-exit.casperlefantom.net.zone
+++ b/roles/dnsserver/files/tor-exit.casperlefantom.net.zone
@@ -12,9 +12,11 @@ tor-exit.casperlefantom.net. IN SOA nse.tor-exit.casperlefantom.net. hostmaster.
 @ IN NS nse.tor-exit.casperlefantom.net.
 @ IN NS nsf.tor-exit.casperlefantom.net.
 
+@ IN A 51.15.167.85
 @ IN AAAA 2001:bc8:3fec:d00:1eaf::
 @ IN TXT "v=spf1 redirect=casperlefantom.net"
 
+manchester IN A 82.65.125.114
 manchester IN AAAA 2a01:e0a:473:35e0::fed0:a:1
 * IN CNAME manchester
 
@@ -47,6 +49,8 @@ nsh IN AAAA 2001:bc8:2db9:100::53
 
 
 
+fb-node-1 IN A 51.15.177.140
 fb-node-1 IN AAAA 2001:bc8:3fec:500:7ea::
 
+fb-node-2 IN A 163.172.211.128
 fb-node-2 IN AAAA 2001:bc8:3fec:b00:b007::
diff --git a/roles/dnsserver/files/vpn.casperlefantom.net.zone b/roles/dnsserver/files/vpn.casperlefantom.net.zone
index d1210c3..932a5f7 100644
--- a/roles/dnsserver/files/vpn.casperlefantom.net.zone
+++ b/roles/dnsserver/files/vpn.casperlefantom.net.zone
@@ -12,9 +12,11 @@ vpn.casperlefantom.net. IN SOA nse.vpn.casperlefantom.net. hostmaster.casperlefa
 @ IN NS nse.vpn.casperlefantom.net.
 @ IN NS nsf.vpn.casperlefantom.net.
 
+@ IN A 163.172.211.128
 @ IN AAAA 2001:bc8:3fec:b00:b007::
 @ IN TXT "v=spf1 redirect=casperlefantom.net"
 
+gw1 IN A 163.172.211.128
 gw1 IN AAAA 2001:bc8:3fec:b00:b007::
 * IN CNAME gw1
 
@@ -49,6 +51,7 @@ nsh IN AAAA 2001:bc8:2db9:100::53
 
 _ssh._tcp IN SRV 5 0 54444 gw4.vpn.casperlefantom.net.
 
+gw4 IN A 51.15.167.85
 gw4 IN AAAA 2001:bc8:3fec:d00:1eaf::
 gw4 IN SSHFP 4 2 37ee15f74974388c32aded32c2b4a9026f9f15ca2ba4020624f0d5ab3b57776e
 gw2 IN CNAME gw4