unbound: Refactor variables

roles/unbound/tasks/main.yml

@@ -12,7 +12,7 @@
   ansible.builtin.command:
     argv:
       - unbound-control-setup
-    creates: "{{ unbound_control_key }}"
+    creates: "{{ unbound_confdir }}/unbound_control.key"
   notify: Restart unbound
 
 - name: Copy zone files
@@ -28,7 +28,7 @@
 
 - name: Copy config
   ansible.builtin.template:
-    dest: "{{ unbound_conf }}"
+    dest: "{{ unbound_confdir }}/unbound.conf"
     src: "unbound.conf.{{ inventory_hostname }}.j2"
     mode: "0644"
     owner: root

roles/unbound/vars/OpenBSD.yml

@@ -1,4 +1,4 @@
 ---
-unbound_conf: /var/unbound/etc/unbound.conf
+unbound_chroot: /var/unbound
-unbound_control_key: /var/unbound/etc/unbound_control.key
+unbound_confdir: "{{ unbound_chroot }}/etc"
-unbound_zonedir: /var/unbound/db
+unbound_zonedir: "{{ unbound_chroot }}/db"

roles/unbound/vars/RedHat.yml

@@ -1,4 +1,3 @@
 ---
-unbound_conf: /etc/unbound/unbound.conf
+unbound_confdir: /etc/unbound
-unbound_control_key: /etc/unbound/unbound_control.key
 unbound_zonedir: /var/lib/unbound