Merge pull request #70 from systemli/enh/debian12

Add support for Debian Bookworm
systemli · Jun 18, 2023 · 2234306 · 2234306
2 parents d1abbb9 + a678cbe
commit 2234306
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 26 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,6 +19,6 @@ on:
 jobs:
   integration:
     name: Integration
-    uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@v1.1.0
+    uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@v1.2.0
     with:
-      distros: '[ "debian11", "debian10" ]'
+      distros: '[ "debian12", "debian11" ]'
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -4,9 +4,6 @@
 bind9_user: bind
 bind9_group: bind
 
-# Listen on IPv6 interfaces
-bind9_ipv6: yes
-
 # Run bind as a DNS recursor?
 bind9_recursor: no
 
@@ -140,4 +137,4 @@ bind9_log_categories:
 
 bind9_generate_ddns_key: true
 bind9_zonedir: /etc/bind/zones
-bind9_local_keydir: files/bind/zones
+bind9_local_keydir: files/bind/zones
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -5,16 +5,6 @@
     state: present
     cache_valid_time: 600
 
-- name: Copy bind9 defaults file
-  ansible.builtin.template:
-    src: "{{ bind9_templates | default('') }}bind/default.j2"
-    dest: /etc/default/bind9
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - Restart bind9
-
 - name: Setup logs
   when: bind9_named_logging
   block:

diff --git a/templates/bind/default.j2 b/templates/bind/default.j2
diff --git a/templates/bind/named.conf.options.j2 b/templates/bind/named.conf.options.j2
@@ -16,19 +16,16 @@ options {
       {{ forwarder }};
     {% endfor %}
   };
-{% endif %}                                                                                                                                                   
+{% endif %}
 
 	//========================================================================
 	// If BIND logs error messages about the root key being expired,
 	// you will need to update your keys.  See https://www.isc.org/bind-keys
 	//========================================================================
 	dnssec-validation {{ bind9_dnssec_validation }};
-{% if ansible_distribution_major_version|int >= 11  %}
 	qname-minimization {{ bind9_qname_minimization }};
-{% endif %}
-	auth-nxdomain no;    # conform to RFC1035
-	listen-on-v6 { any; };
 
+	listen-on-v6 { any; };
 	recursion {{ bind9_recursor|default()|ternary('yes', 'no') }};
 	allow-recursion { {{ bind9_recursor|default()|ternary('our_networks', 'none') }}; };