From a35e66049d601fb7fad413fc66b017bd5ae71816 Mon Sep 17 00:00:00 2001 From: s3lph Date: Wed, 29 Sep 2021 23:56:40 +0200 Subject: [PATCH] Bugfix --- galaxy.yml | 2 +- roles/knot/defaults/main.yml | 2 +- roles/knot/templates/etc/knot/knot.conf.j2 | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index d0c0e1e..a6a773f 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -8,7 +8,7 @@ namespace: s3lph name: nameserver # The version of the collection. Must be compatible with semantic versioning -version: "0.3.0" +version: "0.3.1" # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/knot/defaults/main.yml b/roles/knot/defaults/main.yml index de7fb2b..92c31dd 100644 --- a/roles/knot/defaults/main.yml +++ b/roles/knot/defaults/main.yml @@ -21,7 +21,7 @@ knot_zone_dnssec_signing: 'on' knot_dnssec_policy_algorithm: ecdsap384sha384 knot_dnssec_policy_nsec3: 'on' -knot_dnssec_policy_ksk_shared: 'off' +knot_dnssec_policy_ksk_shared: 'on' knot_dnssec_policy_ksk_size: 384 knot_dnssec_policy_zsk_size: 384 knot_dnssec_policy_zsk_lifetime: 30d diff --git a/roles/knot/templates/etc/knot/knot.conf.j2 b/roles/knot/templates/etc/knot/knot.conf.j2 index 70e4fd8..dc91a36 100644 --- a/roles/knot/templates/etc/knot/knot.conf.j2 +++ b/roles/knot/templates/etc/knot/knot.conf.j2 @@ -87,13 +87,16 @@ acl: submission: {% for zone in zones %} - - id: submission: {{ zone.name }} + - id: submission-{{ zone.name }} check-interval: {{ knot_dnssec_submission_check_interval }} timeout: {{ knot_dnssec_submission_timeout }} +{% if zone.parents is defined and zone.parents | length > 0 %} parent: {% for parent in zone.parents | default([]) %} - {{ parent }} {% endfor %} +{% else %} + parent: [] {% endfor %} policy: