From f43f2f4d77eb035779fc5b40c4c2084970359802 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 17 Jan 2019 10:41:48 -0600 Subject: [PATCH 1/3] move dnsmasq config file to /etc/dnsmasq.d/ Bugfix don't supply named/bind files when not enabled. --- roles/network/tasks/enable_services.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index 272e9e490..d4feb4647 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -34,6 +34,7 @@ - { src: 'named/named-iiab.conf.j2', dest: '/etc/named-iiab.conf', mode: '0644' } - { src: 'named/school.local.zone.db', dest: '/var/named-iiab/', mode: '0644' } - { src: 'named/school.internal.zone.db', dest: '/var/named-iiab/', mode: '0644' } + when: named_enabled and named_install - name: Enable named service ({{ dns_service }}) if named_enabled systemd: @@ -50,9 +51,15 @@ - name: Install /etc/dnsmasq.conf from template, if dnsmasq_enabled template: src: network/dnsmasq.conf.j2 - dest: /etc/dnsmasq.conf + dest: /etc/dnsmasq.d/iiab.conf when: dnsmasq_enabled and dnsmasq_install +- name: Remove /etc/dnsmasq.d/iiab.conf when not dnsmasq_enabled or is Appliance + file: + path: /etc/dnsmasq.d/iiab.conf + state: absent + when: (not dnsmasq_enabled) or (iiab_network_mode == "Appliance") + - name: Enable iiab-dnsmasq systemd service, if dnsmasq_enabled systemd: name: iiab-dnsmasq From 04928693b19aec38b660dd2ef639f4788dfe0231 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 17 Jan 2019 12:43:50 -0600 Subject: [PATCH 2/3] as requested in chat --- roles/network/tasks/enable_services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index d4feb4647..1e018f1d7 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -52,7 +52,7 @@ template: src: network/dnsmasq.conf.j2 dest: /etc/dnsmasq.d/iiab.conf - when: dnsmasq_enabled and dnsmasq_install + when: dnsmasq_enabled and dnsmasq_install and (iiab_network_mode != "Appliance") - name: Remove /etc/dnsmasq.d/iiab.conf when not dnsmasq_enabled or is Appliance file: From e5abe543731dfe012b33b0d8021cd83d87f3dbd3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 17 Jan 2019 15:03:12 -0500 Subject: [PATCH 3/3] Update enable_services.yml --- roles/network/tasks/enable_services.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index 1e018f1d7..52396215d 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -48,13 +48,13 @@ enabled: no when: not named_enabled and named_install -- name: Install /etc/dnsmasq.conf from template, if dnsmasq_enabled +- name: Install /etc/dnsmasq.d/iiab.conf from template, when dnsmasq_enabled and isn't Appliance template: src: network/dnsmasq.conf.j2 dest: /etc/dnsmasq.d/iiab.conf when: dnsmasq_enabled and dnsmasq_install and (iiab_network_mode != "Appliance") -- name: Remove /etc/dnsmasq.d/iiab.conf when not dnsmasq_enabled or is Appliance +- name: Remove /etc/dnsmasq.d/iiab.conf, when not dnsmasq_enabled or is Appliance file: path: /etc/dnsmasq.d/iiab.conf state: absent