Update dns zone files with new ns2 and ns3 records

8 files changed, 62 insertions, 103 deletions

diff --git a/roles/dnsserver/files/2.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.2.5.0.0.0.d.1.4.1.0.0.2.ip6.arpa.zone b/roles/dnsserver/files/2.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.2.5.0.0.0.d.1.4.1.0.0.2.ip6.arpa.zone
deleted file mode 100644
index b931dd1..0000000
--- a/roles/dnsserver/files/2.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.2.5.0.0.0.d.1.4.1.0.0.2.ip6.arpa.zone
+++ /dev/null
@@ -1,13 +0,0 @@
-$ttl 86400
-@ IN SOA nsa.casperlefantom.net. hostmaster.casperlefantom.net. (
-                      2017122100;
-                      28800;
-                      604800;
-                      604800;
-                      86400);
-
-  IN    NS     nsa.casperlefantom.net.
-  IN    NS     nsb.casperlefantom.net.
-  IN    NS     nsc.casperlefantom.net.
-  IN    NS     nsd.casperlefantom.net.
-  IN    PTR    ns3.casperlefantom.net.
diff --git a/roles/dnsserver/files/26.191.31.176.in-addr.arpa.zone b/roles/dnsserver/files/26.191.31.176.in-addr.arpa.zone
deleted file mode 100644
index b931dd1..0000000
--- a/roles/dnsserver/files/26.191.31.176.in-addr.arpa.zone
+++ /dev/null
@@ -1,13 +0,0 @@
-$ttl 86400
-@ IN SOA nsa.casperlefantom.net. hostmaster.casperlefantom.net. (
-                      2017122100;
-                      28800;
-                      604800;
-                      604800;
-                      86400);
-
-  IN    NS     nsa.casperlefantom.net.
-  IN    NS     nsb.casperlefantom.net.
-  IN    NS     nsc.casperlefantom.net.
-  IN    NS     nsd.casperlefantom.net.
-  IN    PTR    ns3.casperlefantom.net.
diff --git a/roles/dnsserver/files/79.2.238.109.in-addr.arpa.zone b/roles/dnsserver/files/79.2.238.109.in-addr.arpa.zone
deleted file mode 100644
index 516f3da..0000000
--- a/roles/dnsserver/files/79.2.238.109.in-addr.arpa.zone
+++ /dev/null
@@ -1,13 +0,0 @@
-$ttl 86400
-@ IN SOA nsa.casperlefantom.net. hostmaster.casperlefantom.net. (
-                      2017122100;
-                      28800;
-                      604800;
-                      604800;
-                      86400);
-
-  IN    NS     nsa.casperlefantom.net.
-  IN    NS     nsb.casperlefantom.net.
-  IN    NS     nsc.casperlefantom.net.
-  IN    NS     nsd.casperlefantom.net.
-  IN    PTR    ns2.casperlefantom.net.
diff --git a/roles/dnsserver/files/admin.casperlefantom.net.zone b/roles/dnsserver/files/admin.casperlefantom.net.zone
index ca76d10..815fa8d 100644
--- a/roles/dnsserver/files/admin.casperlefantom.net.zone
+++ b/roles/dnsserver/files/admin.casperlefantom.net.zone
@@ -1,6 +1,6 @@
 $ttl 86400
 admin.casperlefantom.net. IN SOA nsa.admin.casperlefantom.net. hostmaster.casperlefantom.net. (
-2018110200
+2018122200
 10800
 3600
 604800
@@ -23,11 +23,11 @@ manchester IN AAAA 2a01:e35:2f76:7750::4
 nsa IN A 82.247.103.117
 nsa IN AAAA 2a01:e35:2f76:7750::4
 
-nsb IN A 109.238.2.79
-nsb IN AAAA 2a00:c70:1:109:238:2:79:c0de
+nsb IN A 178.170.58.2
+nsb IN AAAA 2a00:c70:1:178:170:58:2:b50d
 
-nsc IN A 176.31.191.26
-nsc IN AAAA 2001:41d0:52:100::f2
+nsc IN A 109.238.2.40
+nsc IN AAAA 2a00:c70:1:109:238:2:40:bad
 
 nsd IN A 51.15.179.153
 nsd IN AAAA 2001:bc8:3fec:f00:7ea::
@@ -36,11 +36,13 @@ nse IN A 163.172.211.128
 nse IN AAAA 2001:bc8:3fec:b00:b007::
 
 
-111281hpv002079 IN A 109.238.2.79
-111281hpv002079 IN AAAA 2a00:c70:1:109:238:2:79:c0de
+frhb11858flex IN A 178.170.58.2
+frhb11858flex IN AAAA 2a00:c70:1:178:170:58:2:b50d
+111281hpv002079 IN CNAME frhb11858flex
 
-vps128389 IN A 176.31.191.26
-vps128389 IN AAAA 2001:41d0:52:100::f2
+frhb11859flex IN A 109.238.2.40
+frhb11859flex IN AAAA 2a00:c70:1:109:238:2:40:bad
+vps128389 IN CNAME frhb11859flex
 
 sd-129211 IN A 51.15.179.153
 sd-129211 IN AAAA 2001:bc8:3fec:f00:7ea::
diff --git a/roles/dnsserver/files/casperlefantom.net.zone b/roles/dnsserver/files/casperlefantom.net.zone
index a7c69da..468441d 100644
--- a/roles/dnsserver/files/casperlefantom.net.zone
+++ b/roles/dnsserver/files/casperlefantom.net.zone
@@ -1,6 +1,6 @@
 $ttl 86400
 casperlefantom.net. IN SOA nsa.casperlefantom.net. hostmaster.casperlefantom.net. (
-2018110200  ; serial number
+2018122205  ; serial number
 10800  ; refresh
 3600  ; retry
 1209600  ; expire
@@ -29,10 +29,10 @@ nsa.home.casperlefantom.net. IN A 192.168.0.25
 nsa.home.casperlefantom.net. IN AAAA 2a01:e35:2f76:7750::4
 nsb.home.casperlefantom.net. IN A 82.247.103.117
 nsb.home.casperlefantom.net. IN AAAA 2a01:e35:2f76:7750::4
-nsc.home.casperlefantom.net. IN A 109.238.2.79
-nsc.home.casperlefantom.net. IN AAAA 2a00:c70:1:109:238:2:79:c0de
-nsd.home.casperlefantom.net. IN A 176.31.191.26
-nsd.home.casperlefantom.net. IN AAAA 2001:41d0:52:100::f2
+nsc.home.casperlefantom.net. IN A 178.170.58.2
+nsc.home.casperlefantom.net. IN AAAA 2a00:c70:1:178:170:58:2:b50d
+nsd.home.casperlefantom.net. IN A 109.238.2.40
+nsd.home.casperlefantom.net. IN AAAA 2a00:c70:1:109:238:2:40:bad
 nse.home.casperlefantom.net. IN A 51.15.179.153
 nse.home.casperlefantom.net. IN AAAA 2001:bc8:3fec:f00:7ea::
 nsf.home.casperlefantom.net. IN A 163.172.211.128
@@ -43,10 +43,10 @@ admin IN A 82.247.103.117
 admin IN AAAA 2a01:e35:2f76:7750::4
 nsa.admin.casperlefantom.net. IN A 82.247.103.117
 nsa.admin.casperlefantom.net. IN AAAA 2a01:e35:2f76:7750::4
-nsb.admin.casperlefantom.net. IN A 109.238.2.79
-nsb.admin.casperlefantom.net. IN AAAA 2a00:c70:1:109:238:2:79:c0de
-nsc.admin.casperlefantom.net. IN A 176.31.191.26
-nsc.admin.casperlefantom.net. IN AAAA 2001:41d0:52:100::f2
+nsb.admin.casperlefantom.net. IN A 178.170.58.2
+nsb.admin.casperlefantom.net. IN AAAA 2a00:c70:1:178:170:58:2:b50d
+nsc.admin.casperlefantom.net. IN A 109.238.2.40
+nsc.admin.casperlefantom.net. IN AAAA 2a00:c70:1:109:238:2:40:bad
 nsd.admin.casperlefantom.net. IN A 51.15.179.153
 nsd.admin.casperlefantom.net. IN AAAA 2001:bc8:3fec:f00:7ea::
 nse.admin.casperlefantom.net. IN A 163.172.211.128
@@ -122,19 +122,19 @@ search IN TXT "nrybuqtxgxnavtla.onion"
 ssl IN A 82.247.103.117
 ssl IN AAAA 2a01:e35:2f76:7750::4
 
-ns2 IN A 109.238.2.79
-ns2 IN AAAA 2a00:c70:1:109:238:2:79:c0de
-ns2 IN TXT "qunkjql4sgxnb6vr.onion"
+ns2 IN A 178.170.58.2
+ns2 IN AAAA 2a00:c70:1:178:170:58:2:b50d
+ns2 IN TXT "fgh6ulsq2yw5j7wp.onion"
 
-nsb IN A 109.238.2.79
-nsb IN AAAA 2a00:c70:1:109:238:2:79:c0de
-nsb IN TXT "qunkjql4sgxnb6vr.onion"
+nsb IN A 178.170.58.2
+nsb IN AAAA 2a00:c70:1:178:170:58:2:b50d
+nsb IN TXT "fgh6ulsq2yw5j7wp.onion"
 
-ntp2 IN A 109.238.2.79
-ntp2 IN AAAA 2a00:c70:1:109:238:2:79:c0de
+ntp2 IN A 178.170.58.2
+ntp2 IN AAAA 2a00:c70:1:178:170:58:2:b50d
 
-vpnb IN A 109.238.2.79
-vpnb IN AAAA 2a00:c70:1:109:238:2:79:c0de
+vpnb IN A 178.170.58.2
+vpnb IN AAAA 2a00:c70:1:178:170:58:2:b50d
 
 bank IN A 82.247.103.117
 bank IN AAAA 2a01:e35:2f76:7750::4
@@ -143,13 +143,15 @@ blog IN A 51.15.179.153
 blog IN AAAA 2001:bc8:3fec:f00:7ea::
 
 
-111281hpv002079 IN A 109.238.2.79
-111281hpv002079 IN AAAA 2a00:c70:1:109:238:2:79:c0de
-111281hpv002079 IN TXT "qunkjql4sgxnb6vr.onion"
+frhb11858flex IN A 178.170.58.2
+frhb11858flex IN AAAA 2a00:c70:1:178:170:58:2:b50d
+frhb11858flex IN TXT "fgh6ulsq2yw5j7wp.onion"
+111281hpv002079 IN CNAME frhb11858flex
 
-vps128389 IN A 176.31.191.26
-vps128389 IN AAAA 2001:41d0:52:100::f2
-vps128389 IN TXT "gfuzfrkr6mg47ktw.onion"
+frhb11859flex IN A 109.238.2.40
+frhb11859flex IN AAAA 2a00:c70:1:109:238:2:40:bad
+frhb11859flex IN TXT "fpavnwnb2ztpixr5.onion"
+vps128389 IN CNAME frhb11859flex
 
 sd-129211 IN A 51.15.179.153
 sd-129211 IN AAAA 2001:bc8:3fec:f00:7ea::
@@ -157,18 +159,19 @@ sd-129211 IN TXT "bpr7drsao5vozzr5.onion"
 
 sd-94125 IN A 163.172.211.128
 sd-94125 IN AAAA 2001:bc8:3fec:b00:b007::
+sd-94125 IN TXT "wuvphkytdeukbrqm.onion"
 
 
-ns3 IN A 176.31.191.26
-ns3 IN AAAA 2001:41d0:52:100::f2
-ns3 IN TXT "gfuzfrkr6mg47ktw.onion"
+ns3 IN A 109.238.2.40
+ns3 IN AAAA 2a00:c70:1:109:238:2:40:bad
+ns3 IN TXT "fpavnwnb2ztpixr5.onion"
 
-nsc IN A 176.31.191.26
-nsc IN AAAA 2001:41d0:52:100::f2
-nsc IN TXT "gfuzfrkr6mg47ktw.onion"
+nsc IN A 109.238.2.40
+nsc IN AAAA 2a00:c70:1:109:238:2:40:bad
+nsc IN TXT "fpavnwnb2ztpixr5.onion"
 
-ntp3 IN A 176.31.191.26
-ntp3 IN AAAA 2001:41d0:52:100::f2
+ntp3 IN A 109.238.2.40
+ntp3 IN AAAA 2a00:c70:1:109:238:2:40:bad
 
 rtig IN A 51.15.179.153
 rtig IN AAAA 2001:bc8:3fec:f00:7ea::
@@ -199,9 +202,11 @@ nimbus IN AAAA 2001:bc8:3fec:f00:7ea::
 
 ns5 IN A 163.172.211.128
 ns5 IN AAAA 2001:bc8:3fec:b00:b007::
+ns5 IN TXT "wuvphkytdeukbrqm.onion"
 
 nse IN A 163.172.211.128
 nse IN AAAA 2001:bc8:3fec:b00:b007::
+nse IN TXT "wuvphkytdeukbrqm.onion"
 
 ntp5 IN A 163.172.211.128
 ntp5 IN AAAA 2001:bc8:3fec:b00:b007::
diff --git a/roles/dnsserver/files/e.d.0.c.9.7.0.0.2.0.0.0.8.3.2.0.9.0.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa.zone b/roles/dnsserver/files/e.d.0.c.9.7.0.0.2.0.0.0.8.3.2.0.9.0.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa.zone
deleted file mode 100644
index 516f3da..0000000
--- a/roles/dnsserver/files/e.d.0.c.9.7.0.0.2.0.0.0.8.3.2.0.9.0.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa.zone
+++ /dev/null
@@ -1,13 +0,0 @@
-$ttl 86400
-@ IN SOA nsa.casperlefantom.net. hostmaster.casperlefantom.net. (
-                      2017122100;
-                      28800;
-                      604800;
-                      604800;
-                      86400);
-
-  IN    NS     nsa.casperlefantom.net.
-  IN    NS     nsb.casperlefantom.net.
-  IN    NS     nsc.casperlefantom.net.
-  IN    NS     nsd.casperlefantom.net.
-  IN    PTR    ns2.casperlefantom.net.
diff --git a/roles/dnsserver/files/home.casperlefantom.net.zone b/roles/dnsserver/files/home.casperlefantom.net.zone
index ebd292c..f0d2d36 100644
--- a/roles/dnsserver/files/home.casperlefantom.net.zone
+++ b/roles/dnsserver/files/home.casperlefantom.net.zone
@@ -1,6 +1,6 @@
 $ttl 86400
 home.casperlefantom.net. IN SOA nsa.home.casperlefantom.net. hostmaster.casperlefantom.net. (
-2018121800
+2018122200
 10800
 3600
 604800
@@ -20,10 +20,10 @@ nsa IN A 10.42.0.52
 nsa IN AAAA 2a01:e35:2f76:7750::4
 nsb IN A 82.247.103.117
 nsb IN AAAA 2a01:e35:2f76:7750::4
-nsc IN A 109.238.2.79
-nsc IN AAAA 2a00:c70:1:109:238:2:79:c0de
-nsd IN A 176.31.191.26
-nsd IN AAAA 2001:41d0:52:100::f2
+nsc IN A 178.170.58.2
+nsc IN AAAA 2a00:c70:1:178:170:58:2:b50d
+nsd IN A 109.238.2.40
+nsd IN AAAA 2a00:c70:1:109:238:2:40:bad
 nse IN A 51.15.179.153
 nse IN AAAA 2001:bc8:3fec:f00:7ea::
 nsf IN A 163.172.211.128
diff --git a/roles/dnsserver/vars/main.yml b/roles/dnsserver/vars/main.yml
index 7a728e2..02e9d4f 100644
--- a/roles/dnsserver/vars/main.yml
+++ b/roles/dnsserver/vars/main.yml
@@ -7,6 +7,10 @@ whitelist:
   - 192.168.0.0/24
   - 2a01:e35:2f76:7750::/64
   - 82.247.103.117
+  - 178.170.58.2
+  - 2a00:c70:1:178:170:58:2:b50d/96
+  - 109.238.2.40
+  - 2a00:c70:1:109:238:2:40:bad/96
   - 51.15.179.153
   - 2001:bc8:3fec:f00:7ea::/128
   - 163.172.211.128
@@ -21,10 +25,10 @@ zonelist:
   - 4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa
   - 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa
   - 5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa
-  - 79.2.238.109.in-addr.arpa
-  - e.d.0.c.9.7.0.0.2.0.0.0.8.3.2.0.9.0.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa
-  - 26.191.31.176.in-addr.arpa
-  - 2.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.2.5.0.0.0.d.1.4.1.0.0.2.ip6.arpa
+  - 2.58.170.178.in-addr.arpa
+  - d.0.5.b.2.0.0.0.8.5.0.0.0.7.1.0.8.7.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa
+  - 40.2.238.109.in-addr.arpa
+  - d.a.b.0.0.4.0.0.2.0.0.0.8.3.2.0.9.0.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa
   - 153.179.15.51.in-addr.arpa
   - 0.0.0.0.0.0.0.0.0.0.0.0.a.e.7.0.0.0.f.0.c.e.f.3.8.c.b.0.1.0.0.2.ip6.arpa
   - 25.0.168.192.in-addr.arpa