Merge branch 'master' of ssh://gitea.mewissen.site:22422/rene/ansible-pull

roles/nameserver/tasks/install_powerdns_server.yml

@@ -101,16 +101,14 @@
     mode: "0644"
     owner: "root"
     group: "root"
-    force: no
+    force: yes
 
 - name: Nameserver | powerdns-server | set listening IPs
   when:
     - powerdns_secondary is defined
     - powerdns_secondary is true
-    - powerdns_recursor is defined
-    - powerdns_recursor is true
   template:
-    src: "powerdns-server-sec-mysql-config.j2"
+    src: "powerdns-server-sec-config.j2"
     dest: "/etc/powerdns/pdns.conf"
     owner: "root"
     group: "root"

roles/nameserver/templates/powerdns-server-sec-config.j2

@@ -0,0 +1,4 @@
+include-dir=/etc/powerdns/pdns.d
+launch=
+local-address={{ ansible_default_ipv4.address }}, [{{ ansible_default_ipv6.address }}], 127.0.0.1:553{% if wg_local_ip is defined %}, {{ wg_local_ip | ansible.utils.ipaddr('address') }}:553{% endif %}
+security-poll-suffix=

roles/nameserver/templates/powerdns-server-sec-mysql-config .j2

@@ -1,4 +0,0 @@
-launch += gmysql
-gmysql-host = {{ pdns_pri_server }}
-gmysql-password = {{ pdns_db_passwd | default(lookup('password', '/etc/powerdns/pdns.d/.mysqlpw length=20')) }}
-gmysql-dnssec = Yes

roles/nameserver/templates/powerdns-server-sec-mysql-config.j2

@@ -1,4 +1,4 @@
-include-dir=/etc/powerdns/pdns.d
+launch += gmysql
-launch=
+gmysql-host = {{ pdns_pri_server }}
-local-address={{ ansible_default_ipv4.address }}, [{{ ansible_default_ipv6.address }}], 127.0.0.1:553{% if wg_local_ip is defined %}, {{ wg_local_ip | ansible.utils.ipaddr('address') }}:553{% endif %}
+gmysql-password = {{ pdns_db_passwd | default(lookup('password', '/etc/powerdns/pdns.d/.mysqlpw length=20')) }}
-security-poll-suffix=
+gmysql-dnssec = Yes