From 748999d36da35ca0195720202761a350ff189575 Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Mon, 18 May 2020 15:48:38 +0200
Subject: [PATCH] dns: Moved var zones_environment_directory to global vars

---
 group_vars/all/vars.yml                 | 1 +
 roles/dns/application/defaults/main.yml | 3 +--
 roles/dns/application/tasks/main.yml    | 4 ++--
 roles/dns/handlers/defaults/main.yml    | 3 ---
 roles/dns/handlers/handlers/main.yml    | 2 +-
 roles/dns/master/defaults/main.yml      | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 roles/dns/handlers/defaults/main.yml

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index c5d131d..bdb0ea2 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -63,6 +63,7 @@ global_apparmor_profiles_directory: "/etc/apparmor.d"
 global_apt_sources_directory: "/etc/apt/sources.list.d"
 
 global_bind_configuration_directory: "/etc/bind"
+global_dns_zones_environment_directory: "{{ global_configuration_environment_directory }}/dns-zones"
 
 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 7e78c4e..7a049d6 100644
--- a/roles/dns/application/defaults/main.yml
+++ b/roles/dns/application/defaults/main.yml
@@ -5,9 +5,8 @@ options_configuration: "{{ global_bind_configuration_directory }}/named.conf.opt
 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"
-zones_environment_link: "{{ zones_environment_directory }}/{{ zones_environment_link_name }}"
+zones_environment_link: "{{ global_dns_zones_environment_directory }}/{{ zones_environment_link_name }}"
 zones_environment_database_name: "zone.db"
 
 apparmor_profile_name: "usr.sbin.named"
diff --git a/roles/dns/application/tasks/main.yml b/roles/dns/application/tasks/main.yml
index f8ce204..d7602f5 100644
--- a/roles/dns/application/tasks/main.yml
+++ b/roles/dns/application/tasks/main.yml
@@ -15,12 +15,12 @@
     mode: u=rwx,g=rx,o=
   loop:
     - "{{ zones_directory }}"
-    - "{{ zones_environment_directory }}"
+    - "{{ global_dns_zones_environment_directory }}"
 
 - name: Upload makefile to domain zones configuration environment
   template:
     src: zones.makefile
-    dest: "{{ zones_environment_directory }}/makefile"
+    dest: "{{ global_dns_zones_environment_directory }}/makefile"
     owner: root
     group: root
     mode: u=rw,g=r,o=r
diff --git a/roles/dns/handlers/defaults/main.yml b/roles/dns/handlers/defaults/main.yml
deleted file mode 100644
index 6841538..0000000
--- a/roles/dns/handlers/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-zones_environment_directory: "{{ global_configuration_environment_directory }}/dns-zones"
diff --git a/roles/dns/handlers/handlers/main.yml b/roles/dns/handlers/handlers/main.yml
index d24b5ab..f421920 100644
--- a/roles/dns/handlers/handlers/main.yml
+++ b/roles/dns/handlers/handlers/main.yml
@@ -12,5 +12,5 @@
 
 - name: rebuild dns zones
   make:
-    chdir: "{{ zones_environment_directory }}"
+    chdir: "{{ global_dns_zones_environment_directory }}"
   notify: reload bind9
diff --git a/roles/dns/master/defaults/main.yml b/roles/dns/master/defaults/main.yml
index 0fc3905..0af8171 100644
--- a/roles/dns/master/defaults/main.yml
+++ b/roles/dns/master/defaults/main.yml
@@ -6,7 +6,7 @@ domain_directory: "{{ zones_directory }}/{{ domain }}"
 configuration_file: "{{ domain_directory }}/zone.conf"
 database_file: "{{ domain_directory }}/{{ zones_environment_database_name }}"
 keys_directory: "{{ domain_directory }}/keys"
-domain_environment_directory: "{{ zones_environment_directory }}/{{ domain }}"
+domain_environment_directory: "{{ global_dns_zones_environment_directory }}/{{ domain }}"
 
 dns_list_file: "{{ global_dns_list_directory }}/{{ domain }}"