Merge pull request #130 from iiab/master

sync from iiab/iiab

roles/8-mgmt-tools/tasks/main.yml

@@ -30,13 +30,13 @@
 - name: SUGAR-STATS
   include_role:
     name: sugar-stats
-  when: sugar_stats_install and ansible_distribution != "CentOS"
+  when: sugar_stats_install is defined and sugar_stats_install and ansible_distribution != "CentOS"
   tags: olpc, sugar-stats
 
 - name: TEAMVIEWER
   include_role:
     name: teamviewer
-  when: teamviewer_install
+  when: teamviewer_install is defined and teamviewer_install
   tags: teamviewer
 
 - name: VNSTAT
@@ -48,7 +48,7 @@
 - name: XOVIS
   include_role:
     name: xovis
-  when: xovis_install and ansible_distribution != "CentOS"
+  when: xovis_install is defined and xovis_install and ansible_distribution != "CentOS"
   tags: xovis
 
 - name: Recording STAGE 8 HAS COMPLETED ======================

roles/httpd/tasks/main.yml

@@ -102,7 +102,7 @@
 
 - name: Create symlinks for enabling our site (debuntu)
   file:
-    path: "/etc/apache2/sites-enabled/{{ item }}"    # Not nec on Raspbian.  Is this really still needed elsewhere?
+    path: "/etc/apache2/sites-enabled/{{ item }}"
     src: "/etc/apache2/sites-available/{{ item }}"
     state: link
   with_items:
@@ -114,7 +114,7 @@
     path: "{{ item }}"
     state: absent
   with_items:
-    - /etc/apache2/000-default.conf
+    - /etc/apache2/000-default.conf    # Not nec on Raspbian.  Is this really still needed elsewhere?
     - /etc/apache2/sites-enabled/000-default.conf
   when: is_debuntu
 

roles/network/tasks/main.yml

@@ -78,7 +78,7 @@
 #  set_fact:
 #    py_captive_portal_install: True
 
-- name: (Re)Installing captive portal
+- name: (Re)Installing Captive Portal
   include_tasks: captive_portal.yml
   when: py_captive_portal_install
 

roles/openvpn/templates/announcer.j2

@@ -4,15 +4,14 @@
 HANDLE=
 UUID=
 if [ -f /etc/iiab/openvpn_handle ]; then
-    # Option #0: Source directly from /etc/iiab/local_vars.yml in future?
+    # Option #1: Source directly from /etc/iiab/local_vars.yml in future?
-    # Option #1
+    # Option #2
     HANDLE=`cat /etc/iiab/openvpn_handle`
-    # Option #2: UUID is later used, if openvpn_handle is not set
 
 # Sourcing a variable from ~4 different places is a recipe for total confusion
 # (or worse!)  Far better to make variable openvpn_handle and file
-# /etc/iiab/openvpn_handle "obligatory" (EMPTY STRING "" IS TOLERATED, in which
+# /etc/iiab/openvpn_handle "obligatory" (EMPTY STRING "" IS TOLERATED, IN WHICH
-# case OpenVPN server should use /etc/iiab/uuid in lieu of the handle).
+# CASE OPENVPN SERVER TRIES TO USE /etc/iiab/uuid BELOW, IN LIEU OF HANDLE...)
 
 # CLARIF: "systemctl restart openvpn@xscenet" still runs even if the above is
 # defied.  e.g. if an implementer deletes /etc/iiab/openvpn_handle by accident.

roles/phpmyadmin/defaults/main.yml

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