🚑: SOA full name + nsd specific host name when necessary
All checks were successful
ansible-lint / lint-everything (push) Successful in 1m26s
All checks were successful
ansible-lint / lint-everything (push) Successful in 1m26s
This commit is contained in:
@@ -9,3 +9,4 @@ global_smtp_relay_allowed_ips: "{{ allowed_smtp_ips }}"
|
|||||||
ufw_allowed_smtp_ips: "{{ allowed_smtp_ips }}"
|
ufw_allowed_smtp_ips: "{{ allowed_smtp_ips }}"
|
||||||
|
|
||||||
nsd_master: true
|
nsd_master: true
|
||||||
|
nsd_ansible_host: "nsd-master1.ext.mateu.be"
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
$TTL 86400
|
$TTL 86400
|
||||||
@ IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
|
{% set firstserver = groups['master_nsdservers'] | first %}
|
||||||
|
@ IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
|
||||||
{{ dns_serial }}; timestamp serial number
|
{{ dns_serial }}; timestamp serial number
|
||||||
28800; Refresh
|
28800; Refresh
|
||||||
7200; Retry
|
7200; Retry
|
||||||
@@ -8,7 +9,7 @@ $TTL 86400
|
|||||||
)
|
)
|
||||||
|
|
||||||
{% for server in groups['nsdservers'] %}
|
{% for server in groups['nsdservers'] %}
|
||||||
@ IN NS {{ hostvars[server].ansible_host }}.
|
@ IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
$ORIGIN {{ item.name }}.
|
$ORIGIN {{ item.name }}.
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
$TTL 86400
|
$TTL 86400
|
||||||
@ IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
|
{% set firstserver = groups['master_nsdservers'] | first %}
|
||||||
|
@ IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
|
||||||
{{ dns_serial }}; timestamp serial number
|
{{ dns_serial }}; timestamp serial number
|
||||||
28800; Refresh
|
28800; Refresh
|
||||||
7200; Retry
|
7200; Retry
|
||||||
@@ -8,7 +9,7 @@ $TTL 86400
|
|||||||
)
|
)
|
||||||
|
|
||||||
{% for server in groups['nsdservers'] %}
|
{% for server in groups['nsdservers'] %}
|
||||||
@ IN NS {{ hostvars[server].ansible_host }}.
|
@ IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
$ORIGIN {{ item.name }}.
|
$ORIGIN {{ item.name }}.
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
$TTL 86400
|
$TTL 86400
|
||||||
@ IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
|
{% set firstserver = groups['master_nsdservers'] | first %}
|
||||||
|
@ IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
|
||||||
{{ dns_serial }}; timestamp serial number
|
{{ dns_serial }}; timestamp serial number
|
||||||
28800; Refresh
|
28800; Refresh
|
||||||
7200; Retry
|
7200; Retry
|
||||||
@@ -8,7 +9,8 @@ $TTL 86400
|
|||||||
)
|
)
|
||||||
|
|
||||||
{% for server in groups['nsdservers'] %}
|
{% for server in groups['nsdservers'] %}
|
||||||
@ IN NS {{ hostvars[server].ansible_host | regex_replace('^([a-z0-9-]+)\\.', '\\1-v4.') if hostvars[server].ansible_host.endswith('dmz.mateu.be') else hostvars[server].ansible_host }}.
|
{% set current_host = hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) %}
|
||||||
|
@ IN NS {{ current_host | regex_replace('^([a-z0-9-]+)\\.', '\\1-v4.') if current_host.endswith('mateu.be') else current_host }}.
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
$ORIGIN {{ item.name }}.
|
$ORIGIN {{ item.name }}.
|
||||||
@@ -40,6 +42,10 @@ machinbox IN AAAA 2a01:e0a:9bd:2810::1
|
|||||||
mailalt IN CNAME altsrv
|
mailalt IN CNAME altsrv
|
||||||
memcardprogc IN A 10.233.211.199
|
memcardprogc IN A 10.233.211.199
|
||||||
nfs IN A 10.233.212.60
|
nfs IN A 10.233.212.60
|
||||||
|
nsd-master1.ext IN A 37.187.5.75
|
||||||
|
nsd-master1-v4.ext IN A 37.187.5.75
|
||||||
|
nsd-master1.ext IN AAAA 2001:41d0:a:54b::1
|
||||||
|
nsd-master1-v6.ext IN AAAA 2001:41d0:a:54b::1
|
||||||
rb IN A 194.156.203.253
|
rb IN A 194.156.203.253
|
||||||
rc IN A 10.233.211.195
|
rc IN A 10.233.211.195
|
||||||
serenor.dmz IN A {{ global_public_ip_address }}
|
serenor.dmz IN A {{ global_public_ip_address }}
|
||||||
@@ -48,6 +54,7 @@ serenor.dmz IN AAAA 2a01:e0a:9bd:2811::59
|
|||||||
{{ proxmox_host }}.dmz IN A {{ global_public_ip_address }}
|
{{ proxmox_host }}.dmz IN A {{ global_public_ip_address }}
|
||||||
{% if proxmox_host.startswith('dns') %}
|
{% if proxmox_host.startswith('dns') %}
|
||||||
{{ proxmox_host }}-v4.dmz IN A {{ global_public_ip_address }}
|
{{ proxmox_host }}-v4.dmz IN A {{ global_public_ip_address }}
|
||||||
|
{{ proxmox_host }}-v6.dmz IN AAAA {{ hostvars[proxmox_host].proxmox_net0.ip6 | ansible.utils.ipaddr('address') }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ proxmox_host }}.dmz IN AAAA {{ hostvars[proxmox_host].proxmox_net0.ip6 | ansible.utils.ipaddr('address') }}
|
{{ proxmox_host }}.dmz IN AAAA {{ hostvars[proxmox_host].proxmox_net0.ip6 | ansible.utils.ipaddr('address') }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
$TTL 86400
|
$TTL 86400
|
||||||
@ IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
|
{% set firstserver = groups['master_nsdservers'] | first %}
|
||||||
|
@ IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
|
||||||
{{ dns_serial }}; timestamp serial number
|
{{ dns_serial }}; timestamp serial number
|
||||||
28800; Refresh
|
28800; Refresh
|
||||||
7200; Retry
|
7200; Retry
|
||||||
@@ -8,7 +9,7 @@ $TTL 86400
|
|||||||
)
|
)
|
||||||
|
|
||||||
{% for server in groups['nsdservers'] %}
|
{% for server in groups['nsdservers'] %}
|
||||||
@ IN NS {{ hostvars[server].ansible_host }}.
|
@ IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
$ORIGIN {{ item.name }}.
|
$ORIGIN {{ item.name }}.
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
$TTL 86400
|
$TTL 86400
|
||||||
@ IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
|
{% set firstserver = groups['master_nsdservers'] | first %}
|
||||||
|
@ IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
|
||||||
{{ dns_serial }}; timestamp serial number
|
{{ dns_serial }}; timestamp serial number
|
||||||
28800; Refresh
|
28800; Refresh
|
||||||
7200; Retry
|
7200; Retry
|
||||||
@@ -8,7 +9,7 @@ $TTL 86400
|
|||||||
)
|
)
|
||||||
|
|
||||||
{% for server in groups['nsdservers'] %}
|
{% for server in groups['nsdservers'] %}
|
||||||
@ IN NS {{ hostvars[server].ansible_host }}.
|
@ IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
$ORIGIN {{ item.name }}.
|
$ORIGIN {{ item.name }}.
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
$TTL 86400
|
$TTL 86400
|
||||||
@ IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
|
{% set firstserver = groups['master_nsdservers'] | first %}
|
||||||
|
@ IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
|
||||||
{{ dns_serial }}; timestamp serial number
|
{{ dns_serial }}; timestamp serial number
|
||||||
28800; Refresh
|
28800; Refresh
|
||||||
7200; Retry
|
7200; Retry
|
||||||
@@ -8,7 +9,7 @@ $TTL 86400
|
|||||||
)
|
)
|
||||||
|
|
||||||
{% for server in groups['nsdservers'] %}
|
{% for server in groups['nsdservers'] %}
|
||||||
@ IN NS {{ hostvars[server].ansible_host }}.
|
@ IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
$ORIGIN {{ item.name }}.
|
$ORIGIN {{ item.name }}.
|
||||||
|
Reference in New Issue
Block a user