diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index 272e9e490..52396215d 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: @@ -47,11 +48,17 @@ 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.conf - when: dnsmasq_enabled and dnsmasq_install + 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 + 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: