dns/master: Now considered vars for nameserver and mail to be absolute

Meaning the var itself must not have a dot at the end of the name,
but an usage of the variable may need to append a dot.
dehydrated
Felix Stupp 4 years ago
parent 40c6a3ab0f
commit 9d23e12a16
Signed by: zocker
GPG Key ID: 93E1BD26F6B02FB7

@ -9,8 +9,8 @@
roles: roles:
- role: dns/master - role: dns/master
domain: banananet.work domain: banananet.work
main_nameserver_domain: ns1.banananet.work. main_nameserver_domain: ns1.banananet.work
responsible_mail_name: admin.banananet.work. responsible_mail_name: admin.banananet.work
slaves: "{{ nvak_dns_slaves }}" slaves: "{{ nvak_dns_slaves }}"
entries: | entries: |
; Name Servers ; Name Servers
@ -48,8 +48,8 @@
smtp IN CNAME nvak smtp IN CNAME nvak
- role: dns/master - role: dns/master
domain: forumderschan.de domain: forumderschan.de
main_nameserver_domain: ns1.banananet.work. main_nameserver_domain: ns1.banananet.work
responsible_mail_name: admin.banananet.work. responsible_mail_name: admin.banananet.work
slaves: "{{ nvak_dns_slaves }}" slaves: "{{ nvak_dns_slaves }}"
entries: | entries: |
; Name Servers ; Name Servers
@ -64,8 +64,8 @@
@ IN TXT "v=spf1 +mx -all" @ IN TXT "v=spf1 +mx -all"
- role: dns/master - role: dns/master
domain: stadtpiraten-karlsruhe.de domain: stadtpiraten-karlsruhe.de
main_nameserver_domain: ns1.banananet.work. main_nameserver_domain: ns1.banananet.work
responsible_mail_name: admin.banananet.work. responsible_mail_name: admin.banananet.work
slaves: "{{ nvak_dns_slaves }}" slaves: "{{ nvak_dns_slaves }}"
entries: | entries: |
; Name Servers ; Name Servers

@ -13,8 +13,9 @@ dns_list_file: "{{ global_dns_list_directory }}/{{ domain }}"
dnssec_algorithm: "RSASHA512" dnssec_algorithm: "RSASHA512"
dnssec_key_length: "4096" dnssec_key_length: "4096"
main_nameserver_domain: "ns1.{{ domain }}." # Following domain names are considered absolute
responsible_mail_name: "admin.{{ domain }}." main_nameserver_domain: "ns1.{{ domain }}"
responsible_mail_name: "admin.{{ domain }}"
refresh: 86400 refresh: 86400
retry: 7200 retry: 7200
expire: 3600000 expire: 3600000

@ -1,5 +1,5 @@
$TTL 86400 $TTL 86400
@ IN SOA {{ main_nameserver_domain }} {{ responsible_mail_name }} ( @ IN SOA {{ main_nameserver_domain }}. {{ responsible_mail_name }}. (
0 0
{{ refresh }} {{ refresh }}
{{ retry }} {{ retry }}

Loading…
Cancel
Save