From 2ba4737abaf8eb2391e89fcf528fc06e89a29c5e Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 28 Dec 2017 19:08:13 -0500
Subject: [PATCH] hostapd.yml: enable/restart svc if manually_toggle_AP is
 false

---
 roles/network/tasks/hostapd.yml | 68 ++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 895ebfce5..7f1773bf2 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -1,47 +1,55 @@
 - name: Create /etc/hostapd/hostapd.conf from template
-  template: src=hostapd/hostapd.conf.j2
-            dest=/etc/hostapd/hostapd.conf
-            owner=root
-            group=root
-            mode=0644
+  template:
+    src: hostapd/hostapd.conf.j2
+    dest: /etc/hostapd/hostapd.conf
+    owner: root
+    group: root
+    mode: 0644
   when: iiab_wireless_lan_iface is defined
 
 - name: Create /etc/hostapd/hostapd.conf.iiab from template
-  template: src=hostapd/iiab-hostapd.conf.j2
-            dest=/etc/hostapd/hostapd.conf.iiab
-            owner=root
-            group=root
-            mode=0644
+  template:
+    src: hostapd/iiab-hostapd.conf.j2
+    dest: /etc/hostapd/hostapd.conf.iiab
+    owner: root
+    group: root
+    mode: 0644
   when: discovered_wireless_iface is defined
 
 - name: Disable the Access Point 'hostapd' service
-  service: enabled=no
-           name=hostapd.service
+  service:
+    enabled: no
+    name: hostapd.service
   when: not hostapd_enabled
 
 - name: Use custom systemd unit file to start 'hostapd' service
-  template: src=hostapd/hostapd.service.j2
-            dest=/etc/systemd/system/hostapd.service
-            owner=root
-            group=root
-            mode=0644
+  template:
+    src: hostapd/hostapd.service.j2
+    dest: /etc/systemd/system/hostapd.service
+    owner: root
+    group: root
+    mode: 0644
   when: hostapd_enabled
 
 - name: Create /usr/bin/iiab-hotspot-on from template
-  template: src=network/iiab-hotspot-on
-            dest=/usr/bin/iiab-hotspot-on
-            owner=root
-            group=root
-            mode=0755
+  template:
+    src: network/iiab-hotspot-on
+    dest: /usr/bin/iiab-hotspot-on
+    owner: root
+    group: root
+    mode: 0755
 
 - name: Create /usr/bin/iiab-hotspot-off from template
-  template: src=network/iiab-hotspot-off
-            dest=/usr/bin/iiab-hotspot-off
-            owner=root
-            group=root
-            mode=0755
+  template:
+    src: network/iiab-hotspot-off
+    dest: /usr/bin/iiab-hotspot-off
+    owner: root
+    group: root
+    mode: 0755
 
 - name: Enable the Access Point 'hostapd' service
-  service: enabled=yes
-           name=hostapd.service
-  when: iiab_wireless_lan_iface is defined and iiab_network_mode != "Appliance" and hostapd_enabled
+  service:
+    # enabled: yes
+    state: restarted
+    name: hostapd.service
+  when: hostapd_enabled and not manually_toggle_AP and iiab_wireless_lan_iface is defined and iiab_network_mode != "Appliance"