From a4a0d23a879d86f59ff0fd5d4d79053a21e4bdb2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 3 Dec 2018 02:15:29 -0500 Subject: [PATCH 1/8] Create iiab --- roles/network/templates/iiab | 1 + 1 file changed, 1 insertion(+) create mode 100644 roles/network/templates/iiab diff --git a/roles/network/templates/iiab b/roles/network/templates/iiab new file mode 100644 index 000000000..4173a2823 --- /dev/null +++ b/roles/network/templates/iiab @@ -0,0 +1 @@ +bind-interfaces From 04f4e48b1c1cfffc26eead9f4d458314bd244c83 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 3 Dec 2018 02:18:44 -0500 Subject: [PATCH 2/8] Rename roles/network/templates/iiab to roles/network/templates/network/iiab-dnsmasq --- roles/network/templates/{iiab => network/iiab-dnsmasq} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename roles/network/templates/{iiab => network/iiab-dnsmasq} (100%) diff --git a/roles/network/templates/iiab b/roles/network/templates/network/iiab-dnsmasq similarity index 100% rename from roles/network/templates/iiab rename to roles/network/templates/network/iiab-dnsmasq From 73f9f7c3a02bf5a3360606d52a966a3565aeb9b3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 3 Dec 2018 02:19:31 -0500 Subject: [PATCH 3/8] Rename iiab-dnsmasq to dnsmasq-iiab --- roles/network/templates/network/{iiab-dnsmasq => dnsmasq-iiab} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename roles/network/templates/network/{iiab-dnsmasq => dnsmasq-iiab} (100%) diff --git a/roles/network/templates/network/iiab-dnsmasq b/roles/network/templates/network/dnsmasq-iiab similarity index 100% rename from roles/network/templates/network/iiab-dnsmasq rename to roles/network/templates/network/dnsmasq-iiab From d05123afe98569725d9e5e554e2fc6a8f4b22ded Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 3 Dec 2018 02:23:39 -0500 Subject: [PATCH 4/8] Allow systemd-resolved AND dnsmasq to work (#1306) --- roles/network/tasks/dnsmasq.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/network/tasks/dnsmasq.yml b/roles/network/tasks/dnsmasq.yml index 2d7d53e19..ffc9255d6 100644 --- a/roles/network/tasks/dnsmasq.yml +++ b/roles/network/tasks/dnsmasq.yml @@ -3,6 +3,11 @@ name: dnsmasq state: present +- name: Install /etc/dnsmasq.d/dnsmasq-iiab, allowing systemd-resolved AND dnsmasq to work (#1306) + template: + src: network/dnsmasq-iiab + dest: /etc/dnsmasq.d/dnsmasq-iiab + #- name: Stop dnsmasq # service: # name: dnsmasq From 5353d725a82705326209292e6e9863f1b00a9075 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 3 Dec 2018 02:30:16 -0500 Subject: [PATCH 5/8] Update dnsmasq.yml --- roles/network/tasks/dnsmasq.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/dnsmasq.yml b/roles/network/tasks/dnsmasq.yml index ffc9255d6..a37b15d60 100644 --- a/roles/network/tasks/dnsmasq.yml +++ b/roles/network/tasks/dnsmasq.yml @@ -5,7 +5,7 @@ - name: Install /etc/dnsmasq.d/dnsmasq-iiab, allowing systemd-resolved AND dnsmasq to work (#1306) template: - src: network/dnsmasq-iiab + src: network/templates/network/dnsmasq-iiab dest: /etc/dnsmasq.d/dnsmasq-iiab #- name: Stop dnsmasq From ff10a576f3ae5335cc3810dd937340ecc89b8947 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 3 Dec 2018 02:31:12 -0500 Subject: [PATCH 6/8] Update dnsmasq.yml --- roles/network/tasks/dnsmasq.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/dnsmasq.yml b/roles/network/tasks/dnsmasq.yml index a37b15d60..c02d6972b 100644 --- a/roles/network/tasks/dnsmasq.yml +++ b/roles/network/tasks/dnsmasq.yml @@ -5,7 +5,7 @@ - name: Install /etc/dnsmasq.d/dnsmasq-iiab, allowing systemd-resolved AND dnsmasq to work (#1306) template: - src: network/templates/network/dnsmasq-iiab + src: roles/network/templates/network/dnsmasq-iiab dest: /etc/dnsmasq.d/dnsmasq-iiab #- name: Stop dnsmasq From 15d5405295c16ac31ec21f25ee79734fa4542ee1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 3 Dec 2018 02:54:49 -0500 Subject: [PATCH 7/8] Update named.yml --- roles/network/tasks/named.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/network/tasks/named.yml b/roles/network/tasks/named.yml index 0fc0b5a52..8ada1e679 100644 --- a/roles/network/tasks/named.yml +++ b/roles/network/tasks/named.yml @@ -104,3 +104,4 @@ systemd: name: "{{ dns_service }}" state: started + when: not dnsmasq_enabled # See PR #1318 From e74dd2def162e83554bcbef8a622b4b5732b43ef Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 3 Dec 2018 03:05:17 -0500 Subject: [PATCH 8/8] Update named.yml --- roles/network/tasks/named.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/named.yml b/roles/network/tasks/named.yml index 8ada1e679..d3b03382f 100644 --- a/roles/network/tasks/named.yml +++ b/roles/network/tasks/named.yml @@ -104,4 +104,4 @@ systemd: name: "{{ dns_service }}" state: started - when: not dnsmasq_enabled # See PR #1318 + when: not dnsmasq_enabled # See PR #1303, #1306, PR #1318