Merge branch 'main' of ssh://git.valid.dk:2222/daniel/ansible-bind9-role

revert feat: Add remote-servers support for BIND 9.20

handlers/main.yml

@@ -18,7 +18,7 @@
       - "{{ bind9_libdir }}"
     dest: "{{
       bind9_backup_dir + '/bind9-config-' +
-      ansible_date_time.iso8601_basic_short + '.tar.gz' }}"
+      ansible_facts.date_time.iso8601_basic_short + '.tar.gz' }}"
     owner: root
     group: root
     mode: 0640

molecule/default/collections.yml

@@ -0,0 +1,7 @@
+---
+collections:
+  - name: ansible.utils
+  - name: ansible.posix
+  - name: community.crypto
+  - name: community.general
+

molecule/default/converge.yml

@@ -1,5 +1,7 @@
 ---
 - name: Converge
   hosts: all
-  roles:
+  tasks:
-    - keepit.bind9
+    - name: Include bind9 role
+      ansible.builtin.include_role:
+        name: ../../../ansible-bind9-role

molecule/default/molecule.yml

@@ -1,22 +1,25 @@
 ---
-dependency:
-  name: galaxy
 driver:
   name: podman
 platforms:
-  - name: ubuntu-jammy
+  - name: debian-bookworm
-    image: ubuntu:jammy
+    image: docker.io/jrei/systemd-debian:12
-  - name: ubuntu-focal
+    command: /lib/systemd/systemd
-    image: ubuntu:focal
+    privileged: true
-  - name: debian-bullseye
+    volumes:
-    image: debian:bullseye
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+  - name: debian-trixie
+    image: docker.io/jrei/systemd-debian:13
+    command: /lib/systemd/systemd
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
 provisioner:
   name: ansible
-  lint:
+  config_options:
-    name: ansible-lint
+    defaults:
+      ALLOW_BROKEN_CONDITIONALS: true
 verifier:
   name: ansible
-lint: |
-  set -e
-  ansible-lint .
-  yamllint .

molecule/default/prepare.yml

@@ -0,0 +1,6 @@
+---
+- hosts: all
+  tasks:
+    - name: Update apt
+      ansible.builtin.apt:
+        update_cache: true

templates/named.conf.acl.j2

@@ -1,5 +1,6 @@
 {# ACL Macro. Very easy statement. It's just a list of address match elements. #}
 {% for acl in item.acl %}
+
 acl {{ acl.name }} {
 {{ functions.simple_item_list(acl.addresses) -}}
 };

templates/named.conf.controls.j2

@@ -1,3 +1,4 @@
+
 controls {
 {% filter indent(bind9_config_indent, true) %}
 {% for control in item.controls %}

templates/named.conf.dlz.j2

@@ -1,4 +1,5 @@
 {% for dlz in item.dlz if item.dlz is iterable %}
+
 dlz "{{ dlz.name }}" {
 {% filter indent(bind9_config_indent, true) %}
 {{ ('database "' + simple_item_list(dlz.database) + '";') }}

templates/named.conf.dnssec-policy.j2

@@ -1,4 +1,5 @@
 {% for policy in item.dnssec_policy if item.dnssec_policy is iterable %}
+
 dnssec-policy "{{ policy.name }}" {
 {% filter indent(bind9_config_indent, true) %}
 {% if policy.keys is defined and policy.keys %}

templates/named.conf.dyndb.j2

@@ -1,4 +1,5 @@
 {% for dyndb in item.dyndb if item.dyndb is iterable %}
+
 dyndb {{ dyndb.name }} "{{ dyndb.driver }}" {
 {% filter indent(bind9_config_indent, true) %}
 {{ functions.simple_item_list(dyndb.parameters) -}}

templates/named.conf.generator.j2

@@ -1,12 +1,7 @@
 {% import 'named.conf.functions.j2' as functions with context %}
 {{ ansible_managed | comment }}
 {% if item.options is defined and item.options %}
-options {
-{% filter indent(bind9_config_indent,true)%}
 {% include 'named.conf.options.j2' %}
-{% endfilter %}
-};
-
 {% endif %}
 {% if item.acl is defined and item.acl %}
 {% include 'named.conf.acl.j2' %}

templates/named.conf.http.j2

@@ -1,4 +1,5 @@
 {% for http in item.http if item.http is iterable %}
+
 http {{ http.name }} {
 {% filter indent(bind9_config_indent, true) %}
 {% if http.endpoints is defined and http.endpoints %}

templates/named.conf.include.j2

@@ -1,3 +1,4 @@
+
 {% for file in item.include %}
 include "{{ file }}";
 {% endfor %}

templates/named.conf.key.j2

@@ -1,4 +1,5 @@
 {% for keyname in item.keylist if item.keylist is iterable %}
+
 key {{ keyname.name }} {
 {% filter indent(bind9_config_indent, true) %}
 {{ ('algorithm ' + keyname.algorithm + ';\n') if keyname.algorithm is defined and keyname.algorithm -}}

templates/named.conf.logging.j2

@@ -1,3 +1,4 @@
+
 logging {
 {% filter indent(bind9_config_indent, true) %}
 {% for category in item.logging.categories if item.logging.categories is defined and item.logging.categories %}

templates/named.conf.options.j2

@@ -1,3 +1,6 @@
+
+options {
+{% filter indent(bind9_config_indent,true)%}
 {# Unicorn Options#}
 {% if item.options.rrset_order is defined and item.options.rrset_order %}
 rrset-order {
@@ -460,3 +463,6 @@ tkey-dhkey "{{ item.options.tkey_dhkey.key_name }}" {{ item.options.tkey_dhkey.k
 {{ (functions.boolean_option('use-alt-transfer-source', item.options.use_alt_transfer_source) + '\n') if item.options.use_alt_transfer_source is defined -}}
 {{ (functions.boolean_option('zero-no-soa-ttl', item.options.zero_no_soa_ttl) + '\n') if item.options.zero_no_soa_ttl is defined -}}
 {{ (functions.boolean_option('zero-no-soa-ttl-cache', item.options.zero_no_soa_ttl_cache) + '\n') if item.options.zero_no_soa_ttl_cache is defined -}}
+{% endfilter %}
+};
+

templates/named.conf.parental-agents.j2

@@ -1,4 +1,5 @@
 {% for agent in item.parental_agents if item.parental_agents is iterable %}
+
 parental-agents {{ agent.name -}}
 {{ (' port ' + agent.port | string) if agent.port is defined and agent.port -}}
 {{ (' dscp ' + agent.dscp | string) if agent.dscp is defined and agent.dscp }} {

templates/named.conf.primaries.j2

@@ -1,4 +1,5 @@
 {% for primary in item.primaries if item.primaries is iterable %}
+
 primaries {{ primary.name -}}
 {{ (' port ' + primary.port | string) if primary.port is defined and primary.port -}}
 {{ (' dscp ' + primary.dscp | string) if primary.dscp is defined and primary.dscp }} {

templates/named.conf.server.j2

@@ -1,4 +1,5 @@
 {% for server in item.server if item.server is iterable %}
+
 server {{ server.prefix }} {
 {% filter indent(bind9_config_indent, true) %}
 {% if server.transfer_source is defined and server.transfer_source is mapping %}

templates/named.conf.statistics-channels.j2

@@ -1,3 +1,4 @@
+
 statistics-channels {
 {% filter indent(bind9_config_indent, true) %}
 {% for channel in item.statistics_channels if item.statistics_channels is iterable %}

templates/named.conf.tls.j2

@@ -1,4 +1,5 @@
 {% for tls in item.tls if item.tls is iterable %}
+
 tls {{ tls.name }} {
 {% filter indent(bind9_config_indent, true) %}
 {{ ('cert-file "' + tls.cert_file + '";\n') if tls.cert_file is defined and tls.cert_file -}}

templates/named.conf.trust-anchors.j2

@@ -1,3 +1,4 @@
+
 trust-anchors {
 {% filter indent(bind9_config_indent, true) %}
 {% for anchor in item.trust_anchors if item.trust_anchors is iterable %}

templates/named.conf.view.j2

@@ -1,4 +1,5 @@
 {% for view in item.view if item.view is iterable %}
+
 view {{ view.name }} {
 {% filter indent(bind9_config_indent, true) %}
 {{ ('match-recursive-only ' + functions.named_boolean(view.match_recursive_only) + ';\n') if view.match_recursive_only is defined -}}

templates/named.conf.zone.j2

@@ -1,5 +1,5 @@
-# Zones Macro
 {% for zone in item.zones %}
+
 zone "{{ zone.name }}" {
 {% filter indent(bind9_config_indent, true) %}
 # Zone {{ zone.name }} type {{ zone.type }}
@@ -156,5 +156,4 @@ parental-source-v6 {{ zone.parental_source_v6.address -}}
 {{ ('in-view ' + zone.in_view | string+';\n') if zone.in_view is defined and zone.in_view -}}
 {% endfilter %}
 };
-
 {% endfor %}