Merge pull request #403 from iiab/master

Sync from iiab:master

roles/9-local-addons/tasks/main.yml

@@ -30,11 +30,6 @@
     name: calibre-web
   when: calibreweb_install | bool
 
-- name: '2020-05-21: TEMPORARILY INSTALL APACHE UNTIL ADMIN CONSOLE DECLARES (OR REMOVES?) ITS DEPENDENCY within [console : Enable ssl] to avoid error "Neither of apache2ctl nor apachctl found. At least one apache control binary is necessary." -- possibly var adm_cons_force_ssl is still useful here?'
-  package:
-    name: apache2
-  when: admin_console_install | bool
-
 - name: Recording STAGE 9 HAS COMPLETED ====================
   lineinfile:
     path: "{{ iiab_env_file }}"

roles/kiwix/defaults/main.yml

@@ -26,9 +26,9 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml"
 # http://download.kiwix.org/release/kiwix-tools/ ...or sometimes...
 # http://download.kiwix.org/nightly/
 
-kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.1
-kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.1
-kiwix_version_i686: kiwix-tools_linux-i586-3.1.1
+kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.1-0
+kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.1-0
+kiwix_version_i686: kiwix-tools_linux-i586-3.1.1-0
 
 # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
 # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")

vars/default_vars.yml

@@ -229,9 +229,9 @@ pi_swap_file_size: 1024
 
 # 3-BASE-SERVER
 
-# 2020-01-22: See also js_menu_install (above).
-admin_console_install: True    # For now in roles/9-local-addons/tasks/main.yml
-admin_console_enabled: True    # Not in active use as of 2020-05-21
+# 2020-05-22: Neither in use at the moment. See also js_menu_install (above).
+admin_console_install: True
+admin_console_enabled: True
 
 # MySQL MANDATORY - THESE 2 VARS HAVE NO EFFECT - SEE roles/0-init/tasks/main.yml & roles/mysql/tasks/main.yml
 mysql_install: True

vars/local_vars_medical.yml

@@ -1,8 +1,8 @@
 # Default overrides
 kalite_install: False
 kalite_enabled: False
-captive_portal_install: True
-captive_portal_enabled: True
+captiveportal_install: True
+captiveportal_enabled: True
 mediawiki_install: True
 mediawiki_enabled: True
 osm_vector_maps_install: False
@@ -11,6 +11,7 @@ munin_install: True
 munin_enabled: True
 vnstat_install: True
 vnstat_enabled: True
+openvpn_handle: "Medical IIAB - Put Your Name Here"
 # By default
 # kiwix
 # awstats