From 9d23e12a16e62730eed808d914916b9d27040f44 Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Sat, 23 May 2020 23:24:56 +0200
Subject: [PATCH] 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.
---
 playbooks/dns.yml                  | 12 ++++++------
 roles/dns/master/defaults/main.yml |  5 +++--
 roles/dns/master/templates/zone.db |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/playbooks/dns.yml b/playbooks/dns.yml
index dd28bd5..2770c1d 100644
--- a/playbooks/dns.yml
+++ b/playbooks/dns.yml
@@ -9,8 +9,8 @@
   roles:
     - role: dns/master
       domain: banananet.work
-      main_nameserver_domain: ns1.banananet.work.
-      responsible_mail_name: admin.banananet.work.
+      main_nameserver_domain: ns1.banananet.work
+      responsible_mail_name: admin.banananet.work
       slaves: "{{ nvak_dns_slaves }}"
       entries: |
         ; Name Servers
@@ -48,8 +48,8 @@
         smtp IN CNAME nvak
     - role: dns/master
       domain: forumderschan.de
-      main_nameserver_domain: ns1.banananet.work.
-      responsible_mail_name: admin.banananet.work.
+      main_nameserver_domain: ns1.banananet.work
+      responsible_mail_name: admin.banananet.work
       slaves: "{{ nvak_dns_slaves }}"
       entries: |
         ; Name Servers
@@ -64,8 +64,8 @@
         @ IN TXT "v=spf1 +mx -all"
     - role: dns/master
       domain: stadtpiraten-karlsruhe.de
-      main_nameserver_domain: ns1.banananet.work.
-      responsible_mail_name: admin.banananet.work.
+      main_nameserver_domain: ns1.banananet.work
+      responsible_mail_name: admin.banananet.work
       slaves: "{{ nvak_dns_slaves }}"
       entries: |
         ; Name Servers
diff --git a/roles/dns/master/defaults/main.yml b/roles/dns/master/defaults/main.yml
index 1891888..a322e3a 100644
--- a/roles/dns/master/defaults/main.yml
+++ b/roles/dns/master/defaults/main.yml
@@ -13,8 +13,9 @@ dns_list_file: "{{ global_dns_list_directory }}/{{ domain }}"
 dnssec_algorithm: "RSASHA512"
 dnssec_key_length: "4096"
 
-main_nameserver_domain: "ns1.{{ domain }}."
-responsible_mail_name: "admin.{{ domain }}."
+# Following domain names are considered absolute
+main_nameserver_domain: "ns1.{{ domain }}"
+responsible_mail_name: "admin.{{ domain }}"
 refresh: 86400
 retry: 7200
 expire: 3600000
diff --git a/roles/dns/master/templates/zone.db b/roles/dns/master/templates/zone.db
index e867180..24ca334 100644
--- a/roles/dns/master/templates/zone.db
+++ b/roles/dns/master/templates/zone.db
@@ -1,5 +1,5 @@
 $TTL 86400
-@ IN SOA {{ main_nameserver_domain }} {{ responsible_mail_name }} (
+@ IN SOA {{ main_nameserver_domain }}. {{ responsible_mail_name }}. (
   0
   {{ refresh }}
   {{ retry }}