From 3681b522699c1aff5fa1ed962c7e629d256b714d Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 14 Jun 2018 14:55:54 -0400
Subject: [PATCH 1/5]  add dnsmasq_install, dnsmasq_enabled,
 captive_portal_install, captive_portal_enabled (all False)

---
 vars/default_vars.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index c02f7254c..ceaa23098 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -104,6 +104,14 @@ named_install: True
 named_enabled: True
 block_DNS: False
 
+# dnsmasq
+dnsmasq_install: False
+dnsmasq_enabled: False
+
+# Captive Portal experimentation @ https://github.com/iiab/iiab/issues/608
+captive_portal_install: False
+captive_portal_enabled: False
+
 # Squid
 squid_install: False
 squid_enabled: False

From fa150095a69781a54b84694e9d5498bd5c18d09e Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 14 Jun 2018 14:56:42 -0400
Subject: [PATCH 2/5] commas were missing; fix to path
 roles/network/templates/network/dnsmasq.conf.j2

---
 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 0f7c4128b..d7597ee88 100644
--- a/roles/network/tasks/dnsmasq.yml
+++ b/roles/network/tasks/dnsmasq.yml
@@ -14,7 +14,7 @@
             mode={{ item.mode }}
   with_items:
 #   - { src: 'network/dnsmasq.service.rh', dest: '/etc/systemd/system/dnsmasq.service', mode: '0644' }
-   - { src: 'network/dnsmasq.conf.j2' dest: '/etc/dnsmasq.conf' mode: '644' }
+   - { src: 'roles/network/templates/network/dnsmasq.conf.j2', dest: '/etc/dnsmasq.conf', mode: '644' }
 
 - name: Start dnsmasq
   systemd:

From ae956e8f09d9a925572cfbc3e68616affb122be3 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 14 Jun 2018 15:09:42 -0400
Subject: [PATCH 3/5] Update default_vars.yml

---
 vars/default_vars.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index ceaa23098..4521aa174 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -108,7 +108,7 @@ block_DNS: False
 dnsmasq_install: False
 dnsmasq_enabled: False
 
-# Captive Portal experimentation @ https://github.com/iiab/iiab/issues/608
+# Captive Portal highly experimental as of June 2018: https://github.com/iiab/iiab/issues/608
 captive_portal_install: False
 captive_portal_enabled: False
 

From 831107839ff10536340e03d1362dfb903e5a4433 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 14 Jun 2018 15:18:06 -0400
Subject: [PATCH 4/5] @jvonau requests we comment out most lines for now

---
 roles/network/tasks/dnsmasq.yml | 43 ++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/roles/network/tasks/dnsmasq.yml b/roles/network/tasks/dnsmasq.yml
index d7597ee88..cc74c745b 100644
--- a/roles/network/tasks/dnsmasq.yml
+++ b/roles/network/tasks/dnsmasq.yml
@@ -1,24 +1,27 @@
 - name: Install dnsmasq
-  package: name=dnsmasq state=present
-
-- name: Stop dnsmasq
-  service:
+  package:
     name: dnsmasq
-    state: stopped
+    state: present
 
-- name: Configure dhcpd
-  template: src={{ item.src }}
-            dest={{ item.dest }}
-            owner=root
-            group=root
-            mode={{ item.mode }}
-  with_items:
-#   - { src: 'network/dnsmasq.service.rh', dest: '/etc/systemd/system/dnsmasq.service', mode: '0644' }
-   - { src: 'roles/network/templates/network/dnsmasq.conf.j2', dest: '/etc/dnsmasq.conf', mode: '644' }
+#- name: Stop dnsmasq
+#  service:
+#    name: dnsmasq
+#    state: stopped
 
-- name: Start dnsmasq
-  systemd:
-    name: dnsmasq
-    state: restarted
-    enabled: yes
-    daemon_reload: yes
+#- name: Configure dhcpd
+#  template:
+#    src: "{{ item.src }}"
+#    dest: "{{ item.dest }}"
+#    owner: root
+#    group: root
+#    mode: "{{ item.mode }}"
+#  with_items:
+##   - { src: 'network/dnsmasq.service.rh', dest: '/etc/systemd/system/dnsmasq.service', mode: '0644' }
+#   - { src: 'roles/network/templates/network/dnsmasq.conf.j2', dest: '/etc/dnsmasq.conf', mode: '644' }
+
+#- name: Start dnsmasq
+#  systemd:
+#    name: dnsmasq
+#    state: restarted
+#    enabled: yes
+#    daemon_reload: yes

From 11d18826c7bc8124e73c133c4695573d14e507b9 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 14 Jun 2018 15:22:11 -0400
Subject: [PATCH 5/5] 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 cc74c745b..2d7d53e19 100644
--- a/roles/network/tasks/dnsmasq.yml
+++ b/roles/network/tasks/dnsmasq.yml
@@ -8,7 +8,7 @@
 #    name: dnsmasq
 #    state: stopped
 
-#- name: Configure dhcpd
+#- name: Configure dnsmasq
 #  template:
 #    src: "{{ item.src }}"
 #    dest: "{{ item.dest }}"