From 35b78971ebd052b9940dfc9d4b3c0245b974d671 Mon Sep 17 00:00:00 2001 From: Rene Mewissen Date: Thu, 25 Jul 2024 12:04:20 +0200 Subject: [PATCH] syntax --- roles/nameserver/tasks/install_powerdns_server.yml | 4 ++-- roles/nameserver/templates/powerdns-server-pri-api-config.j2 | 2 +- .../nameserver/templates/powerdns-server-pri-mysql-config.j2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/nameserver/tasks/install_powerdns_server.yml b/roles/nameserver/tasks/install_powerdns_server.yml index f47a8a3..b74bab9 100644 --- a/roles/nameserver/tasks/install_powerdns_server.yml +++ b/roles/nameserver/tasks/install_powerdns_server.yml @@ -35,7 +35,7 @@ - name: nameserver | powerdns-server | create database user mysql_user: name: "{{ pdns_db_user }}" # required. Name of the user (role) to add or remove. - password: "{{ pdns_db_passwd | default(lookup('password', '/etc/powerdns/pdns.d/.mysqlpw' length=20)) }}" # not required. Set the user's password.. + password: "{{ pdns_db_passwd | default(lookup('password', '/etc/powerdns/pdns.d/.mysqlpw length=20')) }}" # not required. Set the user's password.. host: localhost priv: "{{ pdns_db_name }}.*:ALL" # not required. MySQL privileges string in the format: C(db.table:priv1,priv2). Multiple privileges can be specified by separating each one using a forward slash: C(db.table:priv/db.table:priv). The format is based on MySQL C(GRANT) statement. Database and table names can be quoted, MySQL-style. If column privileges are used, the C(priv1,priv2) part must be exactly as returned by a C(SHOW GRANT) statement. If not followed, the module will always report changes. It includes grouping columns by permission (C(SELECT(col1,col2)) instead of C(SELECT(col1),SELECT(col2))). append_privs: False # not required. Append the privileges defined by priv to the existing ones for this user instead of overwriting existing ones. @@ -52,10 +52,10 @@ owner: "root" group: "root" force: no - notify: restart_pdns when: - powerdns_primary is defined - powerdns_primary is true + notify: restart_pdns - name: nameserver | powerdns-recursor | disable bind service: diff --git a/roles/nameserver/templates/powerdns-server-pri-api-config.j2 b/roles/nameserver/templates/powerdns-server-pri-api-config.j2 index 5a1a67e..25fdadd 100644 --- a/roles/nameserver/templates/powerdns-server-pri-api-config.j2 +++ b/roles/nameserver/templates/powerdns-server-pri-api-config.j2 @@ -1,4 +1,4 @@ api = Yes -api-key ={{ pdns_api_key | default(lookup('password', '/etc/powerdns/pdns.d/.api-key' length=20)) }} +api-key ={{ pdns_api_key | default(lookup('password', '/etc/powerdns/pdns.d/.api-key length=20')) }} webserver = Yes webserver-address = {% if wg_local_ip is defined %}, {{ wg_local_ip | ansible.utils.ipaddr('address') }}{% else %}{{ ansible_default_ipv4.address }}{% endif %} \ No newline at end of file diff --git a/roles/nameserver/templates/powerdns-server-pri-mysql-config.j2 b/roles/nameserver/templates/powerdns-server-pri-mysql-config.j2 index 39e6da2..78ca609 100644 --- a/roles/nameserver/templates/powerdns-server-pri-mysql-config.j2 +++ b/roles/nameserver/templates/powerdns-server-pri-mysql-config.j2 @@ -1,4 +1,4 @@ launch += gmysql gmysql-socket = {{ pdns_mysql_socket }} -gmysql-password = {{ pdns_db_passwd | default(lookup('password', '/etc/powerdns/pdns.d/.mysqlpw' length=20)) }} +gmysql-password = {{ pdns_db_passwd | default(lookup('password', '/etc/powerdns/pdns.d/.mysqlpw length=20')) }} gmysql-dnssec = Yes