Merge pull request #195 from iiab/master

sync from iiab/iiab

roles/captive-portal/tasks/main.yml

@@ -124,8 +124,23 @@
     name: apache2
     state: restarted
 
-- name: Restart dnsmasq
+#- name: Restart dnsmasq
-  systemd: 
+#  systemd:
+#    name: dnsmasq
+#    state: restarted
+#  when: dnsmasq_enabled
+
+# ABOVE DOES NOT WORK ON UBUNTU 16.04 -- what follows is a crude hack (seems to work!)
+
+- name: Stop dnsmasq
+  systemd:
     name: dnsmasq
-    state: restarted
+    state: stopped
   when: dnsmasq_enabled
+
+- name: Start dnsmasq
+  systemd:
+    name: dnsmasq
+    state: started
+  when: dnsmasq_enabled
+  

roles/captive-portal/templates/capture-wsgi.py

@@ -234,7 +234,7 @@ def android(environ, start_response):
         logger.debug("system < 6:%s"%system_version)
         location = '/android_splash'
         set_204after(ip,0)
-    elif system_version.startswith('7'):
+    elif system_version[:1] >= '7':
         location = "http://" + fully_qualified_domain_name + "/home"
     else:
         #set_204after(ip,20)

roles/lokole/README.rst

@@ -2,7 +2,7 @@
 Lokole README
 =============
 
-This Ansible role installs the `Lokole web app <https://github.com/ascoderu/opwen-webapp>`_ within Internet-in-a-Box.  Lokole is a project by the Canadian-Congolese non-profit `Ascoderu <https://ascoderu.ca>`_.
+This Ansible role installs the `Lokole web app <https://github.com/ascoderu/opwen-webapp>`_ within Internet-in-a-Box (IIAB).  Lokole is a project by the Canadian-Congolese non-profit `Ascoderu <https://ascoderu.ca>`_.
 
 The Lokole is a simple email client that offers functionality like:
 
@@ -14,12 +14,14 @@ The Lokole is a simple email client that offers functionality like:
 Using It
 --------
 
-The Lokole web app can be accessed at http://box/lokole.
+The Lokole web app can be accessed at http://box/lokole
 
 Administration
 --------------
 
-Every Lokole installation has an admin account named ``admin``. By default, the password is ``changeme``.
+Log in with admin account: ``Admin``
+
+By default, the password is: ``changeme``
 
 Administrators can:
 
@@ -27,17 +29,17 @@ Administrators can:
 - Change passwords of user accounts (TODO: admin accounts too?)
 - Promote users to the admin role
 
-All of these actions can be performed from the page http://box/lokole/users.
+All of these actions can be performed from the page http://box/lokole/users
 
 Account Suspension
 ~~~~~~~~~~~~~~~~~~
 
-Administrators have the ability to suspend and reinstate other users' accounts. This functionality is useful for dealing with harassment, cyberbullying, and other forms of abuse.
+Administrators have the ability to suspend and reinstate other users' accounts.  This functionality is useful for dealing with harassment, cyberbullying, and other forms of abuse.
 
 Password Changes
 ~~~~~~~~~~~~~~~~
 
-In the event of a data breach, administrators can update a user's password to a random string. The user can then log in using this temporary password and change. This functionality is also useful in the case that a user forgets their password.
+In the event of a data breach, administrators can update a user's password to a random string.  The user can then log in using this temporary password and change.  This functionality is also useful in the case that a user forgets their password.
 
 Promoting and Demoting Users
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -66,4 +68,4 @@ TODO
 Known Issues
 ------------
 
-For an up-to-date list of open issues, please see the `Lokole project's issue tracker <https://github.com/ascoderu/opwen-webapp/issues>`_.
+For an up-to-date list of open issues, please see the `Lokole project's issue tracker <https://github.com/ascoderu/opwen-webapp/issues>`_.  See also `IIAB's issue tracker <https://github.com/iiab/iiab/issues>`_.

roles/phpmyadmin/defaults/main.yml

@@ -1,4 +1,4 @@
 phpmyadmin_install: False
 phpmyadmin_enabled: False
-phpmyadmin_name: "phpMyAdmin-4.8.3-all-languages"
+phpmyadmin_name: "phpMyAdmin-4.8.4-all-languages"
 phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip"