From e07b4e853de0c025d7eb08eef9e597fc7d605e1d Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 18 Apr 2020 14:40:39 -0400 Subject: [PATCH 1/5] kiwix-tools 3.1.0 -> 3.1.0-1 --- roles/kiwix/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index d5b27e8cf..a41004601 100644 --- a/roles/kiwix/defaults/main.yml +++ b/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_linux64: kiwix-tools_linux-x86_64-3.1.0 -kiwix_version_i686: kiwix-tools_linux-i586-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-1 +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") From b5279e9422dc619eb0cae679d5277b1d40903dd1 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sat, 18 Apr 2020 14:44:15 -0400 Subject: [PATCH 2/5] hitchhiker to skip errors on stem.so --- roles/nginx/tasks/install.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index 41f734b63..8d193cfb3 100644 --- a/roles/nginx/tasks/install.yml +++ b/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 From 43a2c7412b1a457f8bef5e959f1111aa60d6ebfb Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sat, 18 Apr 2020 14:44:46 -0400 Subject: [PATCH 3/5] add local vars for medical users --- vars/local_vars_medical.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 vars/local_vars_medical.yml diff --git a/vars/local_vars_medical.yml b/vars/local_vars_medical.yml new file mode 100644 index 000000000..37ef36418 --- /dev/null +++ b/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 From ca73c956caa93faa1cd340467d75a01102bd3648 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sat, 18 Apr 2020 15:00:40 -0400 Subject: [PATCH 4/5] skip php version we don't have yet --- roles/www_base/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/www_base/tasks/main.yml b/roles/www_base/tasks/main.yml index 59d05172d..e3ee21047 100644 --- a/roles/www_base/tasks/main.yml +++ b/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: From 2a63ca5bd69a925b0dc468d7aa29361052e081fc Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 18 Apr 2020 16:25:12 -0400 Subject: [PATCH 5/5] Emergency fix for PR #2342 --- roles/captiveportal/templates/checkurls | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/captiveportal/templates/checkurls b/roles/captiveportal/templates/checkurls index 61719651f..998d797f6 100755 --- a/roles/captiveportal/templates/checkurls +++ b/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