diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 8edb7ce..c5d131d 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -62,6 +62,8 @@ global_apparmor_profiles_directory: "/etc/apparmor.d" global_apt_sources_directory: "/etc/apt/sources.list.d" +global_bind_configuration_directory: "/etc/bind" + global_ip_discover_url: "https://keys.banananet.work/ping" global_ip_discover_register_pass: "{{ lookup('password', 'credentials/ip_discover/register_pass chars=digits,ascii_letters length=256') }}" diff --git a/roles/dns/application/defaults/main.yml b/roles/dns/application/defaults/main.yml index dd06c95..7e78c4e 100644 --- a/roles/dns/application/defaults/main.yml +++ b/roles/dns/application/defaults/main.yml @@ -1,10 +1,9 @@ --- dns_user: "bind" -configuration_directory: "/etc/bind" -options_configuration: "{{ configuration_directory }}/named.conf.options" -zones_configuration: "{{ configuration_directory }}/named.conf.local" -zones_directory: "{{ configuration_directory }}/zones" +options_configuration: "{{ global_bind_configuration_directory }}/named.conf.options" +zones_configuration: "{{ global_bind_configuration_directory }}/named.conf.local" +zones_directory: "{{ global_bind_configuration_directory }}/zones" # zones_environment_directory from dns/handlers zones_environment_link_name: "conf"