Merge pull request #189 from iiab/master

sync from iiab/iiab

roles/captive-portal/tasks/main.yml

@@ -4,22 +4,18 @@
     state: present
   with_items:
     - python-dateutil
-    - sqlite3    # @georgehunt hopes to move this to 2-common (or more like stage 3-base-server, alongside MySQL) in October 2018
+    - sqlite3    # @georgejhunt hopes to move this to 2-common (or more likely 3-base-server, alongside MySQL) in October 2018
 
-- name: Install wsgi (debuntu)
+- name: Install libapache2-mod-wsgi (debuntu)
   package:
-    name: "{{ item }}"
+    name: libapache2-mod-wsgi
     state: present
-  with_items:
-    - libapache2-mod-wsgi
   when: is_debuntu
 
-- name: Install wsgi (not debuntu)
+- name: Install mod_wsgi (not debuntu)
   package:
-    name: "{{ item }}"
+    name: mod_wsgi
     state: present
-  with_items:
-    - mod_wsgi
   when: not is_debuntu
 
 - name: Create directory /opt/iiab/captive-portal for scripts & templates
@@ -125,8 +121,8 @@
 
 - name: Restart apache2
   systemd: 
-     name: apache2
-     state: restarted
+    name: apache2
+    state: restarted
 
 - name: Restart dnsmasq
   systemd: 

vars/default_vars.yml

@@ -116,11 +116,11 @@ dns_jail_enabled: False
 
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
-# extensively refined in Sept 2018 (https://github.com/iiab/iiab/pull/1179)
+# extensively refined later in 2018 (PRs #1179, #1300, #1327).
 captive_portal_install: True
 captive_portal_enabled: True
 captive_portal_port: 9090
-# In a pinch, disable it by running: systemctl disable captive-portal
+# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
 
 # Set to "False" if you want to revert to the older Dynamic Menuing system
 # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)

vars/local_vars_big.yml

@@ -57,10 +57,10 @@ dns_jail_enabled: False
 
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
-# extensively refined in Sept 2018 (https://github.com/iiab/iiab/pull/1179)
+# extensively refined later in 2018 (PRs #1179, #1300, #1327).
 captive_portal_install: True
 captive_portal_enabled: True
-# In a pinch, disable it by running: systemctl disable captive-portal
+# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
 
 # Set to "False" if you want to revert to the older Dynamic Menuing system
 # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)

vars/local_vars_medium.yml

@@ -57,10 +57,10 @@ dns_jail_enabled: False
 
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
-# extensively refined in Sept 2018 (https://github.com/iiab/iiab/pull/1179)
+# extensively refined later in 2018 (PRs #1179, #1300, #1327).
 captive_portal_install: True
 captive_portal_enabled: True
-# In a pinch, disable it by running: systemctl disable captive-portal
+# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
 
 # Set to "False" if you want to revert to the older Dynamic Menuing system
 # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)

vars/local_vars_min.yml

@@ -57,10 +57,10 @@ dns_jail_enabled: False
 
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
-# extensively refined in Sept 2018 (https://github.com/iiab/iiab/pull/1179)
+# extensively refined later in 2018 (PRs #1179, #1300, #1327).
 captive_portal_install: True
 captive_portal_enabled: True
-# In a pinch, disable it by running: systemctl disable captive-portal
+# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
 
 # Set to "False" if you want to revert to the older Dynamic Menuing system
 # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)