Merge pull request #389 from iiab/master

sync from iiab:master

roles/captiveportal/templates/checkurls

@@ -10,13 +10,11 @@ ipv6.msftncsi.com.edgesuite.net
 www.msftncsi.com
 www.msftncsi.com.edgesuite.net
 www.msftconnecttest.com
-#www.msn.com
 teredo.ipv6.microsoft.com
 teredo.ipv6.microsoft.com.nsatc.net
 captive.apple.com
 init-p01st.push.apple.com
 connectivitycheck.android.com
-#www.google.com
 mtalk.google.com
 alt4-mtalk.google.com
 alt6-mtalk.google.com

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.0
+kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.0-1
-kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.0
+kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.0-1
-kiwix_version_i686: kiwix-tools_linux-i586-3.1.0
+kiwix_version_i686: kiwix-tools_linux-i586-3.1.0-1
 
 # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
 # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")

roles/nginx/tasks/install.yml

@@ -51,12 +51,14 @@
 
 # php-stem extension installed by roles/www_base/tasks/php-stem.yml
 # here it is linked to php-fpm
+# we skip any errors which probably due to the lack of the .so for the current platform
 - name: Symlink /etc/php/{{ php_version }}/fpm/conf.d/20-stem.ini -> /etc/php/{{ php_version }}/mods-available/stem.ini
   file:
     src: "/etc/php/{{ php_version }}/mods-available/stem.ini"
     path: "/etc/php/{{ php_version }}/fpm/conf.d/20-stem.ini"
     state: link
-  when: php_version != 7.4
+  ignore_errors: yes
+  #when: php_version != 7.4
   #when: nginx_enabled | bool
 
 - name: Restart php{{ php_version }}-fpm systemd service

roles/www_base/tasks/main.yml

@@ -7,7 +7,7 @@
 - include_tasks: html.yml
 
 - include_tasks: php-stem.yml
-  when: php_version != 7.4
+  when: php_version < 7.4
 
 - name: Create dir {{ doc_root }}/home -- if you customized var iiab_home_url e.g. in /etc/iiab/local_vars.yml, that dir is created later -- by www_options/tasks/main.yml
   file:

vars/local_vars_medical.yml

@@ -0,0 +1,16 @@
+# Default overrides
+kalite_install: False
+kalite_enabled: False
+captive_portal_install: True
+captive_portal_enabled: True
+mediawiki_install: True
+mediawiki_enabled: True
+osm_vector_maps_install: False
+osm_vector_maps_enabled: False
+munin_install: True
+munin_enabled: True
+vnstat_install: True
+vnstat_enabled: True
+# By default
+# kiwix
+# awstats