From b5279e9422dc619eb0cae679d5277b1d40903dd1 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sat, 18 Apr 2020 14:44:15 -0400 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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: