diff options
7 files changed, 6 insertions, 100 deletions
diff --git a/roles/dnsserver/files/1.7.3.c.0.e.e.f.f.f.2.f.0.4.a.e.0.0.6.e.2.3.d.0.2.3.4.8.2.0.a.2.ip6.arpa.zone b/roles/dnsserver/files/1.7.3.c.0.e.e.f.f.f.2.f.0.4.a.e.0.0.6.e.2.3.d.0.2.3.4.8.2.0.a.2.ip6.arpa.zone deleted file mode 100644 index ac31431..0000000 --- a/roles/dnsserver/files/1.7.3.c.0.e.e.f.f.f.2.f.0.4.a.e.0.0.6.e.2.3.d.0.2.3.4.8.2.0.a.2.ip6.arpa.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ttl 86400 -@ IN SOA ns1.exocet14.net. hostmaster.casperlefantom.net. ( - 2015050301; - 28800; - 604800; - 604800; - 86400); - - IN NS ns1.exocet14.net. - IN PTR exocet.exocet14.net. diff --git a/roles/dnsserver/files/216.82.26.93.in-addr.arpa.zone b/roles/dnsserver/files/216.82.26.93.in-addr.arpa.zone deleted file mode 100644 index 2d16e02..0000000 --- a/roles/dnsserver/files/216.82.26.93.in-addr.arpa.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ttl 86400 -@ IN SOA ns1.exocet14.net. hostmaster.casperlefantom.net. ( - 2015050302; - 28800; - 604800; - 604800; - 86400); - - IN NS ns1.exocet14.net. - IN PTR exocet.exocet14.net. diff --git a/roles/dnsserver/files/3.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.zone b/roles/dnsserver/files/3.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.zone deleted file mode 100644 index 28411ea..0000000 --- a/roles/dnsserver/files/3.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.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ttl 86400 -@ IN SOA ns1.casperlefantom.net. hostmaster.casperlefantom.net. ( - 2015111500; - 28800; - 604800; - 604800; - 86400); - - IN NS ns1.casperlefantom.net. - IN PTR mosquito.home.casperlefantom.net. diff --git a/roles/dnsserver/files/exocet14.net.zone b/roles/dnsserver/files/exocet14.net.zone deleted file mode 100644 index 59c2fe0..0000000 --- a/roles/dnsserver/files/exocet14.net.zone +++ /dev/null @@ -1,30 +0,0 @@ -$ttl 86400 -exocet14.net. IN SOA ns1.exocet14.net. hostmaster.casperlefantom.net. ( -2015050304 -10800 -3600 -604800 -38400 ) - -@ IN NS ns1.exocet14.net. -@ IN NS ns2.exocet14.net. -@ IN NS ns3.exocet14.net. - -@ IN A 93.26.82.216 -@ IN AAAA 2a02:8432:d32:e600:ea40:f2ff:fee0:c371 - -www IN A 93.26.82.216 -www IN AAAA 2a02:8432:d32:e600:ea40:f2ff:fee0:c371 -* IN CNAME www - -exocet IN A 93.26.82.216 -exocet IN AAAA 2a02:8432:d32:e600:ea40:f2ff:fee0:c371 - -ns1 IN A 82.247.103.117 -ns1 IN AAAA 2a01:e35:2f76:7750::4 - -ns2 IN A 178.170.111.194 -ns2 IN AAAA 2a00:c70:1:178:170:111:194:c0de - -ns3 IN A 176.31.191.26 -ns3 IN AAAA 2001:41d0:52:100::f2 diff --git a/roles/dnsserver/tasks/config.yml b/roles/dnsserver/tasks/config.yml index 7230376..552d1f8 100644 --- a/roles/dnsserver/tasks/config.yml +++ b/roles/dnsserver/tasks/config.yml @@ -17,9 +17,7 @@ - home.casperlefantom.net.zone - admin.casperlefantom.net.zone - vpn.casperlefantom.net.zone - - exocet14.net.zone - 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.zone - - 3.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.zone - 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.zone - 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.zone - 117.103.247.82.in-addr.arpa.zone @@ -27,8 +25,6 @@ - 79.2.238.109.in-addr.arpa.zone - 26.191.31.176.in-addr.arpa.zone - 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 - - 216.82.26.93.in-addr.arpa.zone - - 1.7.3.c.0.e.e.f.f.f.2.f.0.4.a.e.0.0.6.e.2.3.d.0.2.3.4.8.2.0.a.2.ip6.arpa.zone - 244.75.154.195.in-addr.arpa.zone - name: Ouverture des ports Firewalld diff --git a/roles/dnsserver/templates/named.conf.j2 b/roles/dnsserver/templates/named.conf.j2 index b255726..07d4b7e 100644 --- a/roles/dnsserver/templates/named.conf.j2 +++ b/roles/dnsserver/templates/named.conf.j2 @@ -16,9 +16,7 @@ acl "whitelist-recursion" { acl "transferlist" { {{ slave1_ipv6 }}; {{ slave2_ipv6 }}; - {{ slave3_ipv6 }}; - {{ slave4_ipv6 }}; - {{ slave5_ipv4 }}; + {{ slave3_ipv4 }}; }; {% endif %} @@ -137,22 +135,6 @@ server {{ slave2_ipv6 }} { server {{ slave3_ipv4 }} { keys { Forwarder; }; }; - -server {{ slave3_ipv6 }} { - keys { Forwarder; }; -}; - -server {{ slave4_ipv4 }} { - keys { Forwarder; }; -}; - -server {{ slave4_ipv6 }} { - keys { Forwarder; }; -}; - -server {{ slave5_ipv4 }} { - keys { Forwarder; }; -}; {% endif %} {% if is_dnsmaster is not defined %} server {{ master_ipv4 }} { diff --git a/roles/dnsserver/vars/main.yml b/roles/dnsserver/vars/main.yml index 51fff73..d7a1878 100644 --- a/roles/dnsserver/vars/main.yml +++ b/roles/dnsserver/vars/main.yml @@ -4,16 +4,10 @@ master_ipv6: 2a01:e35:2f76:7750::4 slave1_ipv4: 109.238.2.79 slave1_ipv6: 2a00:c70:1:109:238:2:79:c0de -slave2_ipv4: 192.168.0.61 -slave2_ipv6: 2a01:e35:2f76:7750::11 +slave2_ipv4: 176.31.191.26 +slave2_ipv6: 2001:41d0:52:100::f2 -slave3_ipv4: 192.168.0.52 -slave3_ipv6: 2a01:e35:2f76:7750::3 - -slave4_ipv4: 176.31.191.26 -slave4_ipv6: 2001:41d0:52:100::f2 - -slave5_ipv4: 195.154.75.244 +slave3_ipv4: 195.154.75.244 whitelist: @@ -23,11 +17,9 @@ whitelist: - 2a01:e35:2f76:7750::/64 - 82.247.103.117 - 2a00:c70:1:109:238:2:79:c0de - - 2a01:e35:399c:8f80::/64 - - 83.153.200.248 + - 2a01:e35:8acd:8900::/64 + - 88.172.216.144 - 2001:41d0:52:100::f2 - - 93.26.82.216 - - 2a02:8432:d32:e600::/64 - 195.154.75.244 zonelist: @@ -35,18 +27,14 @@ zonelist: - home.casperlefantom.net - admin.casperlefantom.net - vpn.casperlefantom.net - - exocet14.net - 117.103.247.82.in-addr.arpa - 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 - - 3.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 - - 216.82.26.93.in-addr.arpa - - 1.7.3.c.0.e.e.f.f.f.2.f.0.4.a.e.0.0.6.e.2.3.d.0.2.3.4.8.2.0.a.2.ip6.arpa - 244.75.154.195.in-addr.arpa domainlist: |