From 1958c4df54ddf21f623d820fb6d44a6c85298237 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sat, 23 May 2020 23:22:11 +0200 Subject: [PATCH] dns: Renamed role entries to server_entries To distinguish between simple entries role (coming in the future) and entries role bundled with server-related entries (A, AAAA, SSHFP) --- roles/acme/certificate/meta/main.yml | 2 +- roles/dns/handlers/handlers/main.yml | 2 +- roles/dns/master/defaults/main.yml | 2 +- roles/dns/{entries => server_entries}/defaults/main.yml | 0 roles/dns/{entries => server_entries}/tasks/main.yml | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename roles/dns/{entries => server_entries}/defaults/main.yml (100%) rename roles/dns/{entries => server_entries}/tasks/main.yml (100%) diff --git a/roles/acme/certificate/meta/main.yml b/roles/acme/certificate/meta/main.yml index 9e9056d..1ffa3da 100644 --- a/roles/acme/certificate/meta/main.yml +++ b/roles/acme/certificate/meta/main.yml @@ -5,5 +5,5 @@ allow_duplicates: yes dependencies: - role: acme/application - role: nginx/application - - role: dns/entries + - role: dns/server_entries # domain diff --git a/roles/dns/handlers/handlers/main.yml b/roles/dns/handlers/handlers/main.yml index d68302e..f867d04 100644 --- a/roles/dns/handlers/handlers/main.yml +++ b/roles/dns/handlers/handlers/main.yml @@ -5,7 +5,7 @@ name: bind9 state: restarted -# SYNC following with handlers of role dns/entries +# SYNC following with handlers of role dns/server_entries - name: reload bind9 systemd: diff --git a/roles/dns/master/defaults/main.yml b/roles/dns/master/defaults/main.yml index 8a1e684..1891888 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: "{{ global_dns_zones_environment_directory }}/{{ domain }}" # SYNC role dns/entries +domain_environment_directory: "{{ global_dns_zones_environment_directory }}/{{ domain }}" # SYNC role dns/server_entries dns_list_file: "{{ global_dns_list_directory }}/{{ domain }}" diff --git a/roles/dns/entries/defaults/main.yml b/roles/dns/server_entries/defaults/main.yml similarity index 100% rename from roles/dns/entries/defaults/main.yml rename to roles/dns/server_entries/defaults/main.yml diff --git a/roles/dns/entries/tasks/main.yml b/roles/dns/server_entries/tasks/main.yml similarity index 100% rename from roles/dns/entries/tasks/main.yml rename to roles/dns/server_entries/tasks/main.yml