From 8a9fd29c72c61ac3f7eca1ba43387972069efc0d Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Wed, 15 Jan 2025 21:26:29 +0000 Subject: [PATCH] unbound: Refactor variables --- roles/unbound/tasks/main.yml | 4 ++-- roles/unbound/vars/OpenBSD.yml | 6 +++--- roles/unbound/vars/RedHat.yml | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/roles/unbound/tasks/main.yml b/roles/unbound/tasks/main.yml index 5ec99fb..a64720b 100644 --- a/roles/unbound/tasks/main.yml +++ b/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 diff --git a/roles/unbound/vars/OpenBSD.yml b/roles/unbound/vars/OpenBSD.yml index c952c8a..5f41acd 100644 --- a/roles/unbound/vars/OpenBSD.yml +++ b/roles/unbound/vars/OpenBSD.yml @@ -1,4 +1,4 @@ --- -unbound_conf: /var/unbound/etc/unbound.conf -unbound_control_key: /var/unbound/etc/unbound_control.key -unbound_zonedir: /var/unbound/db +unbound_chroot: /var/unbound +unbound_confdir: "{{ unbound_chroot }}/etc" +unbound_zonedir: "{{ unbound_chroot }}/db" diff --git a/roles/unbound/vars/RedHat.yml b/roles/unbound/vars/RedHat.yml index a15473b..816739c 100644 --- a/roles/unbound/vars/RedHat.yml +++ b/roles/unbound/vars/RedHat.yml @@ -1,4 +1,3 @@ --- -unbound_conf: /etc/unbound/unbound.conf -unbound_control_key: /etc/unbound/unbound_control.key +unbound_confdir: /etc/unbound unbound_zonedir: /var/lib/unbound