summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2018-12-29 14:58:54 +0100
committerMatthieu Saulnier <fantom@fedoraproject.org>2018-12-29 14:58:54 +0100
commitc6dcb7e38a30c4775e18963834b7387124aad79e (patch)
tree442c950159c2c1ca0dd83f323cdc62914a6c3b40
parent8c387c4fece3978f0cf51e6b3f745029d8df6a30 (diff)
downloadplaybooks-ansible-c6dcb7e38a30c4775e18963834b7387124aad79e.tar.gz
playbooks-ansible-c6dcb7e38a30c4775e18963834b7387124aad79e.tar.xz
playbooks-ansible-c6dcb7e38a30c4775e18963834b7387124aad79e.zip
Update inventory host files and host vars for ns2 + ns3
-rw-r--r--host_vars/109.238.2.4015
-rw-r--r--host_vars/109.238.2.798
-rw-r--r--host_vars/176.31.191.268
-rw-r--r--host_vars/178.170.58.215
-rw-r--r--host_vars/192.168.0.2517
-rw-r--r--host_vars/d72vewh3wa4lwpaj.onion17
-rw-r--r--host_vars/fgh6ulsq2yw5j7wp.onion15
-rw-r--r--host_vars/fpavnwnb2ztpixr5.onion15
-rw-r--r--host_vars/gfuzfrkr6mg47ktw.onion8
-rw-r--r--host_vars/manchester.casperlefantom.net17
-rw-r--r--host_vars/manchester.home.casperlefantom.net17
-rw-r--r--host_vars/ns2.casperlefantom.net9
-rw-r--r--host_vars/ns3.casperlefantom.net15
-rw-r--r--host_vars/qunkjql4sgxnb6vr.onion8
-rw-r--r--hosts.net7
-rw-r--r--hosts.tor3
-rw-r--r--roles/dnsserver/files/casperlefantom.net.zone19
17 files changed, 103 insertions, 110 deletions
diff --git a/host_vars/109.238.2.40 b/host_vars/109.238.2.40
new file mode 100644
index 0000000..7280ea1
--- /dev/null
+++ b/host_vars/109.238.2.40
@@ -0,0 +1,15 @@
+# torrelay
+nickname: Casper03
+orport: 995
+dirport: 110
+bprate: '2 MBytes'
+bpburst: '3 MBytes'
+maxadvertised: '1 MBytes'
+# ntpserver
+masterlist:
+ - ntp1.casperlefantom.net
+# reverseproxy
+domainhttps:
+ - ns3.casperlefantom.net
+ - nsc.casperlefantom.net
+ - ntp3.casperlefantom.net
diff --git a/host_vars/109.238.2.79 b/host_vars/109.238.2.79
deleted file mode 100644
index 6b0ac1a..0000000
--- a/host_vars/109.238.2.79
+++ /dev/null
@@ -1,8 +0,0 @@
-# torrelay
-nickname: Casper02
-orport: 995
-dirport: 110
-bprate: '2 MBytes'
-bpburst: '3 MBytes'
-maxadvertised: '1 MBytes'
-is_ntpslave: true
diff --git a/host_vars/176.31.191.26 b/host_vars/176.31.191.26
deleted file mode 100644
index 43e29bb..0000000
--- a/host_vars/176.31.191.26
+++ /dev/null
@@ -1,8 +0,0 @@
-# torrelay
-nickname: Casper03
-orport: 995
-dirport: 110
-bprate: '6 MBytes'
-bpburst: '7 MBytes'
-maxadvertised: '5 MBytes'
-is_ntpslave: true
diff --git a/host_vars/178.170.58.2 b/host_vars/178.170.58.2
new file mode 100644
index 0000000..526b5ae
--- /dev/null
+++ b/host_vars/178.170.58.2
@@ -0,0 +1,15 @@
+# torrelay
+nickname: Casper02
+orport: 995
+dirport: 110
+bprate: '2 MBytes'
+bpburst: '3 MBytes'
+maxadvertised: '1 MBytes'
+# ntpserver
+masterlist:
+ - ntp1.casperlefantom.net
+# reverseproxy
+domainhttps:
+ - ns2.casperlefantom.net
+ - nsb.casperlefantom.net
+ - ntp2.casperlefantom.net
diff --git a/host_vars/192.168.0.25 b/host_vars/192.168.0.25
index 96ecc65..774d41b 100644
--- a/host_vars/192.168.0.25
+++ b/host_vars/192.168.0.25
@@ -22,23 +22,6 @@ hiddenservices:
- { number: 4, port: 443, host: "127.0.0.1:4434" }
- { number: 5, port: 80, host: "127.0.0.1:4433" }
- { number: 6, port: 80, host: "127.0.0.1:4433" }
-# reverseproxy
-domainhttps:
- - admin.casperlefantom.net
- - nsa.casperlefantom.net
- - ns1.casperlefantom.net
- - ntp1.casperlefantom.net
- - imap.casperlefantom.net
- - ssl.casperlefantom.net
- - mail.casperlefantom.net
- - smtp.casperlefantom.net
- - voip.casperlefantom.net
- - jabber.casperlefantom.net
- - conference.casperlefantom.net
- - manchester.admin.casperlefantom.net
- - mirror.casperlefantom.net
- - nsa.admin.casperlefantom.net
- - bt1.admin.casperlefantom.net
# proxy
revport: 4435
revports: 4433
diff --git a/host_vars/d72vewh3wa4lwpaj.onion b/host_vars/d72vewh3wa4lwpaj.onion
index 96ecc65..774d41b 100644
--- a/host_vars/d72vewh3wa4lwpaj.onion
+++ b/host_vars/d72vewh3wa4lwpaj.onion
@@ -22,23 +22,6 @@ hiddenservices:
- { number: 4, port: 443, host: "127.0.0.1:4434" }
- { number: 5, port: 80, host: "127.0.0.1:4433" }
- { number: 6, port: 80, host: "127.0.0.1:4433" }
-# reverseproxy
-domainhttps:
- - admin.casperlefantom.net
- - nsa.casperlefantom.net
- - ns1.casperlefantom.net
- - ntp1.casperlefantom.net
- - imap.casperlefantom.net
- - ssl.casperlefantom.net
- - mail.casperlefantom.net
- - smtp.casperlefantom.net
- - voip.casperlefantom.net
- - jabber.casperlefantom.net
- - conference.casperlefantom.net
- - manchester.admin.casperlefantom.net
- - mirror.casperlefantom.net
- - nsa.admin.casperlefantom.net
- - bt1.admin.casperlefantom.net
# proxy
revport: 4435
revports: 4433
diff --git a/host_vars/fgh6ulsq2yw5j7wp.onion b/host_vars/fgh6ulsq2yw5j7wp.onion
new file mode 100644
index 0000000..526b5ae
--- /dev/null
+++ b/host_vars/fgh6ulsq2yw5j7wp.onion
@@ -0,0 +1,15 @@
+# torrelay
+nickname: Casper02
+orport: 995
+dirport: 110
+bprate: '2 MBytes'
+bpburst: '3 MBytes'
+maxadvertised: '1 MBytes'
+# ntpserver
+masterlist:
+ - ntp1.casperlefantom.net
+# reverseproxy
+domainhttps:
+ - ns2.casperlefantom.net
+ - nsb.casperlefantom.net
+ - ntp2.casperlefantom.net
diff --git a/host_vars/fpavnwnb2ztpixr5.onion b/host_vars/fpavnwnb2ztpixr5.onion
new file mode 100644
index 0000000..7280ea1
--- /dev/null
+++ b/host_vars/fpavnwnb2ztpixr5.onion
@@ -0,0 +1,15 @@
+# torrelay
+nickname: Casper03
+orport: 995
+dirport: 110
+bprate: '2 MBytes'
+bpburst: '3 MBytes'
+maxadvertised: '1 MBytes'
+# ntpserver
+masterlist:
+ - ntp1.casperlefantom.net
+# reverseproxy
+domainhttps:
+ - ns3.casperlefantom.net
+ - nsc.casperlefantom.net
+ - ntp3.casperlefantom.net
diff --git a/host_vars/gfuzfrkr6mg47ktw.onion b/host_vars/gfuzfrkr6mg47ktw.onion
deleted file mode 100644
index 43e29bb..0000000
--- a/host_vars/gfuzfrkr6mg47ktw.onion
+++ /dev/null
@@ -1,8 +0,0 @@
-# torrelay
-nickname: Casper03
-orport: 995
-dirport: 110
-bprate: '6 MBytes'
-bpburst: '7 MBytes'
-maxadvertised: '5 MBytes'
-is_ntpslave: true
diff --git a/host_vars/manchester.casperlefantom.net b/host_vars/manchester.casperlefantom.net
index 96ecc65..774d41b 100644
--- a/host_vars/manchester.casperlefantom.net
+++ b/host_vars/manchester.casperlefantom.net
@@ -22,23 +22,6 @@ hiddenservices:
- { number: 4, port: 443, host: "127.0.0.1:4434" }
- { number: 5, port: 80, host: "127.0.0.1:4433" }
- { number: 6, port: 80, host: "127.0.0.1:4433" }
-# reverseproxy
-domainhttps:
- - admin.casperlefantom.net
- - nsa.casperlefantom.net
- - ns1.casperlefantom.net
- - ntp1.casperlefantom.net
- - imap.casperlefantom.net
- - ssl.casperlefantom.net
- - mail.casperlefantom.net
- - smtp.casperlefantom.net
- - voip.casperlefantom.net
- - jabber.casperlefantom.net
- - conference.casperlefantom.net
- - manchester.admin.casperlefantom.net
- - mirror.casperlefantom.net
- - nsa.admin.casperlefantom.net
- - bt1.admin.casperlefantom.net
# proxy
revport: 4435
revports: 4433
diff --git a/host_vars/manchester.home.casperlefantom.net b/host_vars/manchester.home.casperlefantom.net
index 96ecc65..774d41b 100644
--- a/host_vars/manchester.home.casperlefantom.net
+++ b/host_vars/manchester.home.casperlefantom.net
@@ -22,23 +22,6 @@ hiddenservices:
- { number: 4, port: 443, host: "127.0.0.1:4434" }
- { number: 5, port: 80, host: "127.0.0.1:4433" }
- { number: 6, port: 80, host: "127.0.0.1:4433" }
-# reverseproxy
-domainhttps:
- - admin.casperlefantom.net
- - nsa.casperlefantom.net
- - ns1.casperlefantom.net
- - ntp1.casperlefantom.net
- - imap.casperlefantom.net
- - ssl.casperlefantom.net
- - mail.casperlefantom.net
- - smtp.casperlefantom.net
- - voip.casperlefantom.net
- - jabber.casperlefantom.net
- - conference.casperlefantom.net
- - manchester.admin.casperlefantom.net
- - mirror.casperlefantom.net
- - nsa.admin.casperlefantom.net
- - bt1.admin.casperlefantom.net
# proxy
revport: 4435
revports: 4433
diff --git a/host_vars/ns2.casperlefantom.net b/host_vars/ns2.casperlefantom.net
index 6b0ac1a..526b5ae 100644
--- a/host_vars/ns2.casperlefantom.net
+++ b/host_vars/ns2.casperlefantom.net
@@ -5,4 +5,11 @@ dirport: 110
bprate: '2 MBytes'
bpburst: '3 MBytes'
maxadvertised: '1 MBytes'
-is_ntpslave: true
+# ntpserver
+masterlist:
+ - ntp1.casperlefantom.net
+# reverseproxy
+domainhttps:
+ - ns2.casperlefantom.net
+ - nsb.casperlefantom.net
+ - ntp2.casperlefantom.net
diff --git a/host_vars/ns3.casperlefantom.net b/host_vars/ns3.casperlefantom.net
index 43e29bb..7280ea1 100644
--- a/host_vars/ns3.casperlefantom.net
+++ b/host_vars/ns3.casperlefantom.net
@@ -2,7 +2,14 @@
nickname: Casper03
orport: 995
dirport: 110
-bprate: '6 MBytes'
-bpburst: '7 MBytes'
-maxadvertised: '5 MBytes'
-is_ntpslave: true
+bprate: '2 MBytes'
+bpburst: '3 MBytes'
+maxadvertised: '1 MBytes'
+# ntpserver
+masterlist:
+ - ntp1.casperlefantom.net
+# reverseproxy
+domainhttps:
+ - ns3.casperlefantom.net
+ - nsc.casperlefantom.net
+ - ntp3.casperlefantom.net
diff --git a/host_vars/qunkjql4sgxnb6vr.onion b/host_vars/qunkjql4sgxnb6vr.onion
deleted file mode 100644
index 6b0ac1a..0000000
--- a/host_vars/qunkjql4sgxnb6vr.onion
+++ /dev/null
@@ -1,8 +0,0 @@
-# torrelay
-nickname: Casper02
-orport: 995
-dirport: 110
-bprate: '2 MBytes'
-bpburst: '3 MBytes'
-maxadvertised: '1 MBytes'
-is_ntpslave: true
diff --git a/hosts.net b/hosts.net
index 858ccd1..6f1ac8f 100644
--- a/hosts.net
+++ b/hosts.net
@@ -7,10 +7,9 @@ ns4.casperlefantom.net:54444 ansible_python_interpreter=/usr/bin/python3
ns5.casperlefantom.net:54444
[reverseproxy]
-manchester.home.casperlefantom.net:54444 ansible_python_interpreter=/usr/bin/python3
ns4.casperlefantom.net:54444 ansible_python_interpreter=/usr/bin/python3
-178.170.58.2:54444
-109.238.2.40:54444
+ns2.casperlefantom.net:54444
+ns3.casperlefantom.net:54444
[website-engines]
# php-fpm/memcached containers
@@ -39,3 +38,5 @@ ns4.casperlefantom.net:54444 ansible_python_interpreter=/usr/bin/python3
manchester.home.casperlefantom.net:54444 ansible_python_interpreter=/usr/bin/python3
pratt.home.casperlefantom.net:54444 ansible_python_interpreter=/usr/bin/python3
ns5.casperlefantom.net:54444
+ns2.casperlefantom.net:54444
+ns3.casperlefantom.net:54444
diff --git a/hosts.tor b/hosts.tor
index 9abe2da..2d5efb5 100644
--- a/hosts.tor
+++ b/hosts.tor
@@ -7,7 +7,6 @@ bpr7drsao5vozzr5.onion:54444 ansible_python_interpreter=/usr/bin/python3
wuvphkytdeukbrqm.onion:54444
[reverseproxy]
-d72vewh3wa4lwpaj.onion:54444 ansible_python_interpreter=/usr/bin/python3
bpr7drsao5vozzr5.onion:54444 ansible_python_interpreter=/usr/bin/python3
fgh6ulsq2yw5j7wp.onion:54444
fpavnwnb2ztpixr5.onion:54444
@@ -39,3 +38,5 @@ bpr7drsao5vozzr5.onion:54444 ansible_python_interpreter=/usr/bin/python3
d72vewh3wa4lwpaj.onion:54444 ansible_python_interpreter=/usr/bin/python3
pmzbj5yqmfblccbe.onion:54444 ansible_python_interpreter=/usr/bin/python3
wuvphkytdeukbrqm.onion:54444
+fgh6ulsq2yw5j7wp.onion:54444
+fpavnwnb2ztpixr5.onion:54444
diff --git a/roles/dnsserver/files/casperlefantom.net.zone b/roles/dnsserver/files/casperlefantom.net.zone
index a2cf5fe..d7bbc27 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. (
-2018122501 ; serial number
+2018122901 ; serial number
10800 ; refresh
3600 ; retry
1209600 ; expire
@@ -24,8 +24,14 @@ admin IN NS nsd.admin.casperlefantom.net.
admin IN NS nse.admin.casperlefantom.net.
@ IN MX 10 mail.casperlefantom.net.
+@ 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:f00:7ea::
+@ IN AAAA 2a00:c70:1:178:170:58:2:b50d
+@ IN AAAA 2a00:c70:1:109:238:2:40:bad
@ IN TXT "v=spf1 mx mx:casperlefantom.net mx:jaysfoodventure.com ip4:82.247.103.117 ip6:2a01:e35:2f76:7750::4 -all"
@@ -95,6 +101,10 @@ mail IN A 82.247.103.117
mail IN AAAA 2a01:e35:2f76:7750::4
mail IN TXT "v=spf1 a a:mail.casperlefantom.net ip4:82.247.103.117 ip6:2a01:e35:2f76:7750::4 -all"
+mx1 IN A 82.247.103.117
+mx1 IN AAAA 2a01:e35:2f76:7750::4
+mx1 IN TXT "v=spf1 a a:mx1.casperlefantom.net ip4:82.247.103.117 ip6:2a01:e35:2f76:7750::4 -all"
+
smtp IN A 82.247.103.117
smtp IN AAAA 2a01:e35:2f76:7750::4
@@ -179,6 +189,9 @@ nsc IN TXT "fpavnwnb2ztpixr5.onion"
ntp3 IN A 109.238.2.40
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:f00:7ea::
@@ -217,5 +230,9 @@ nse IN TXT "wuvphkytdeukbrqm.onion"
ntp5 IN A 163.172.211.128
ntp5 IN AAAA 2001:bc8:3fec:b00:b007::
+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"
+
vpnc IN A 163.172.211.128
vpnc IN AAAA 2001:bc8:3fec:b00:b007::