Update local repo files and dns zone files

8 files changed, 41 insertions, 50 deletions

diff --git a/roles/common/templates/fedora-fantom-hidden.repo.j2 b/roles/common/templates/fedora-fantom-hidden.repo.j2
index 7faf573..bbb8958 100644
--- a/roles/common/templates/fedora-fantom-hidden.repo.j2
+++ b/roles/common/templates/fedora-fantom-hidden.repo.j2
@@ -1,6 +1,8 @@
 [fedora-fantom-hidden]
 name=Fedora $releasever - $basearch on Casper's hidden server
+{% if ansible_distribution_version|int <= 29 -%}
 failovermethod=priority
+{% endif -%}
 baseurl=http://pmstfd4f6s5bm2xq.onion/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 enabled={{ mirrorhiddenenable }}
 repo_gpgcheck=0
diff --git a/roles/common/templates/fedora-fantom.repo.j2 b/roles/common/templates/fedora-fantom.repo.j2
index a808e86..8fcd5dd 100644
--- a/roles/common/templates/fedora-fantom.repo.j2
+++ b/roles/common/templates/fedora-fantom.repo.j2
@@ -1,6 +1,8 @@
 [fedora-fantom]
 name=Fedora $releasever - $basearch on Casper's server
+{% if ansible_distribution_version|int <= 29 -%}
 failovermethod=priority
+{% endif -%}
 baseurl=https://{{ mirrorhost }}/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 enabled={{ mirrorenable }}
 repo_gpgcheck=0
diff --git a/roles/common/templates/updates-fantom-hidden.repo.j2 b/roles/common/templates/updates-fantom-hidden.repo.j2
index a465f30..a7c8244 100644
--- a/roles/common/templates/updates-fantom-hidden.repo.j2
+++ b/roles/common/templates/updates-fantom-hidden.repo.j2
@@ -1,6 +1,8 @@
 [updates-fantom-hidden]
 name=Fedora $releasever - $basearch - Updates on Casper's hidden server
+{% if ansible_distribution_version|int <= 29 -%}
 failovermethod=priority
+{% endif -%}
 {% if ansible_distribution_version|int <= 27 -%}
 baseurl=http://pmstfd4f6s5bm2xq.onion/pub/fedora/linux/updates/$releasever/$basearch/
 {% else %}
@@ -16,7 +18,9 @@ skip_if_unavailable=False
 
 [updates-debuginfo-fantom-hidden]
 name=Fedora $releasever - $basearch - Updates - Debug on Casper's hidden server
+{% if ansible_distribution_version|int <= 29 -%}
 failovermethod=priority
+{% endif -%}
 baseurl=http://pmstfd4f6s5bm2xq.onion/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 enabled=0
 repo_gpgcheck=0
@@ -25,15 +29,3 @@ gpgcheck=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=False
-
-[updates-source-fantom-hidden]
-name=Fedora $releasever - Updates Source on Casper's hidden server
-failovermethod=priority
-baseurl=http://pmstfd4f6s5bm2xq.onion/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/roles/common/templates/updates-fantom.repo.j2 b/roles/common/templates/updates-fantom.repo.j2
index 7647aea..13d6e63 100644
--- a/roles/common/templates/updates-fantom.repo.j2
+++ b/roles/common/templates/updates-fantom.repo.j2
@@ -1,6 +1,8 @@
 [updates-fantom]
 name=Fedora $releasever - $basearch - Updates on Casper's server
+{% if ansible_distribution_version|int <= 29 -%}
 failovermethod=priority
+{% endif -%}
 {% if ansible_distribution_version|int <= 27 -%}
 baseurl=https://{{ mirrorhost }}/pub/fedora/linux/updates/$releasever/$basearch/
 {% else %}
@@ -16,7 +18,9 @@ skip_if_unavailable=False
 
 [updates-debuginfo-fantom]
 name=Fedora $releasever - $basearch - Updates - Debug on Casper's server
+{% if ansible_distribution_version|int <= 29 -%}
 failovermethod=priority
+{% endif -%}
 baseurl=https://{{ mirrorhost }}/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 enabled=0
 repo_gpgcheck=0
@@ -25,15 +29,3 @@ gpgcheck=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=False
-
-[updates-source-fantom]
-name=Fedora $releasever - Updates Source on Casper's server
-failovermethod=priority
-baseurl=https://{{ mirrorhost }}/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/roles/dnsserver/files/admin.casperlefantom.net.zone b/roles/dnsserver/files/admin.casperlefantom.net.zone
index d107ec8..d67f408 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 nse.admin.casperlefantom.net. hostmaster.casperlefantom.net. (
-2019022351
+2019060901
 10800
 3600
 604800
@@ -62,3 +62,10 @@ bt2 IN AAAA 2001:bc8:3fec:500:7ea::
 
 bt3 IN A 163.172.211.128
 bt3 IN AAAA 2001:bc8:3fec:b00:b007::
+
+finance IN A 51.15.179.153
+finance IN A 178.170.58.2
+finance IN A 109.238.2.40
+finance IN AAAA 2001:bc8:3fec:500:7ea::
+finance IN AAAA 2a00:c70:1:178:170:58:2:b50d
+finance IN AAAA 2a00:c70:1:109:238:2:40:bad
diff --git a/roles/dnsserver/files/casperlefantom.net.zone b/roles/dnsserver/files/casperlefantom.net.zone
index 1ef6dd6..dfc638e 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 nse.casperlefantom.net. hostmaster.casperlefantom.net. (
-2019030924  ; serial number
+2019072002  ; serial number
 86400  ; refresh
 3600  ; retry
 1209600  ; expire
@@ -152,9 +152,6 @@ search IN AAAA 2a00:c70:1:109:238:2:40:bad
 search IN TXT "nrybuqtxgxnavtla.onion"
 
 
-ssl IN A 82.247.103.117
-ssl IN AAAA 2a01:e35:2f76:7750::4
-
 ns2 IN A 178.170.58.2
 ns2 IN AAAA 2a00:c70:1:178:170:58:2:b50d
 ns2 IN TXT "fgh6ulsq2yw5j7wp.onion"
@@ -169,8 +166,9 @@ ntp2 IN AAAA 2a00:c70:1:178:170:58:2:b50d
 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
+tor-exit-node-fb-01 IN A 178.170.58.2
+tor-exit-node-fb-01 IN AAAA 2a00:c70:1:178:170:58:2:b50d
+
 
 blog IN A 51.15.179.153
 blog IN A 178.170.58.2
@@ -213,8 +211,8 @@ ntp3 IN AAAA 2a00:c70:1:109:238:2:40:bad
 vpnd IN A 109.238.2.40
 vpnd IN AAAA 2a00:c70:1:109:238:2:40:bad
 
-rtig IN A 51.15.179.153
-rtig IN AAAA 2001:bc8:3fec:500:7ea::
+tor-exit-node-fb-02 IN A 109.238.2.40
+tor-exit-node-fb-02 IN AAAA 2a00:c70:1:109:238:2:40:bad
 
 
 ns4 IN A 51.15.179.153
@@ -231,6 +229,9 @@ ntp4 IN AAAA 2001:bc8:3fec:500:7ea::
 vpna IN A 51.15.179.153
 vpna IN AAAA 2001:bc8:3fec:500:7ea::
 
+tor-exit-node-fb-03 IN A 51.15.179.153
+tor-exit-node-fb-03 IN AAAA 2001:bc8:3fec:500:7ea::
+
 
 cirrus IN A 51.15.179.153
 cirrus IN A 178.170.58.2
@@ -240,9 +241,6 @@ cirrus IN AAAA 2a00:c70:1:178:170:58:2:b50d
 cirrus IN AAAA 2a00:c70:1:109:238:2:40:bad
 cirrus IN TXT "w77rtjmn4c4oggn6.onion"
 
-nimbus IN A 51.15.179.153
-nimbus IN AAAA 2001:bc8:3fec:500:7ea::
-
 
 ns5 IN A 163.172.211.128
 ns5 IN AAAA 2001:bc8:3fec:b00:b007::
@@ -261,3 +259,5 @@ mx2 IN TXT "v=spf1 a a:mx2.casperlefantom.net ip4:163.172.211.128 ip6:2001:bc8:3
 
 vpnc IN A 163.172.211.128
 vpnc IN AAAA 2001:bc8:3fec:b00:b007::
+
+keyring.vs IN A 87.231.30.233
diff --git a/roles/dnsserver/files/home.casperlefantom.net.zone b/roles/dnsserver/files/home.casperlefantom.net.zone
index 38de36f..07c7747 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 nsf.home.casperlefantom.net. hostmaster.casperlefantom.net. (
-2019021600
+2019063001
 10800
 3600
 604800
@@ -96,6 +96,10 @@ _matrix._tcp IN SRV 5 0 8448 home.casperlefantom.net.
 _xmpp-client._tcp IN SRV 5 0 5222 home.casperlefantom.net.
 _xmpp-server._tcp IN SRV 5 0 5269 jabber.casperlefantom.net.
 
+_sip._udp IN SRV 5 0 5060 falcon.home.casperlefantom.net.
+_sip._tcp IN SRV 5 0 5060 falcon.home.casperlefantom.net.
+_sips._tcp IN SRV 5 0 5060 falcon.home.casperlefantom.net.
+
 ntp1 IN A 192.168.0.25
 ntp1 IN A 10.42.0.52
 ntp1 IN AAAA 2a01:e35:2f76:7750::4
diff --git a/roles/dnsserver/files/jaysfoodventure.com.zone b/roles/dnsserver/files/jaysfoodventure.com.zone
index 8288cf3..3a6deb7 100644
--- a/roles/dnsserver/files/jaysfoodventure.com.zone
+++ b/roles/dnsserver/files/jaysfoodventure.com.zone
@@ -1,6 +1,6 @@
 $ttl 86400
 jaysfoodventure.com. IN SOA nse.jaysfoodventure.com. hostmaster.jaysfoodventure.com. (
-2019012300  ; serial number
+2019070600  ; serial number
 86400  ; refresh
 3600  ; retry
 1209600  ; expire
@@ -12,12 +12,8 @@ jaysfoodventure.com. IN SOA nse.jaysfoodventure.com. hostmaster.jaysfoodventure.
 
 @ IN MX 30 mx1.casperlefantom.net.
 @ IN MX 40 mx2.casperlefantom.net.
-@ IN A 51.15.179.153
-@ IN A 178.170.58.2
-@ IN A 109.238.2.40
-@ IN AAAA 2001:bc8:3fec:500:7ea::
-@ IN AAAA 2a00:c70:1:178:170:58:2:b50d
-@ IN AAAA 2a00:c70:1:109:238:2:40:bad
+@ IN A 0.0.0.0
+@ IN AAAA ::
 @ IN TXT "v=spf1 redirect=casperlefantom.net"
 
 
@@ -29,12 +25,8 @@ me IN CNAME jaysfoodventure.com.
 static IN CNAME jaysfoodventure.com.
 
 
-www IN A 51.15.179.153
-www IN A 178.170.58.2
-www IN A 109.238.2.40
-www IN AAAA 2001:bc8:3fec:500:7ea::
-www IN AAAA 2a00:c70:1:178:170:58:2:b50d
-www IN AAAA 2a00:c70:1:109:238:2:40:bad
+www IN A 0.0.0.0
+www IN AAAA ::
 * IN CNAME www