From 0d74192d9a3c8fd58529de3414170bc38b351efa Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sat, 25 Jan 2020 14:10:17 -0500 Subject: [PATCH 1/4] reinstate php-stem --- roles/httpd/tasks/main.yml | 7 +--- roles/httpd/tasks/php-stem.yml | 44 +++++++++++++++++++++++ roles/httpd/tasks/php-stem.yml.deprecated | 35 ------------------ 3 files changed, 45 insertions(+), 41 deletions(-) create mode 100644 roles/httpd/tasks/php-stem.yml delete mode 100644 roles/httpd/tasks/php-stem.yml.deprecated diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index df0e18d01..00bdaf052 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -11,12 +11,7 @@ - include_tasks: install.yml - include_tasks: html.yml - -# 2018-07-18: Partially fixes search @ http://box/modules/es-wikihow (on RPi -# anyway) https://github.com/iiab/iiab/issues/829 & PR #925 -# 2020-01-23: Deprecated as @tim-moody's attempt to revive this for PHP 7.3 -# instead of 7.0 failed: https://github.com/iiab/iiab/issues/2123 -#- include_tasks: php-stem.yml +- include_tasks: php-stem.yml - name: Install /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation. (Script can be run manually and/or at the end of Stage 4 = roles/4-server-options/tasks/main.yml) template: diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml new file mode 100644 index 000000000..8c03c869e --- /dev/null +++ b/roles/httpd/tasks/php-stem.yml @@ -0,0 +1,44 @@ +# Fixes search @ http://box/modules/es-wikihow (popular with Spanish youth) +# Source code: http://download.iiab.io/packages/php-stem.src.tar +# June 2018 debugging & compilation thanks to Tim Moody & George Hunt +# Original bug: https://github.com/iiab/iiab/issues/829 + +- name: Unarchive http://download.iiab.io/packages/php-stem{{ php_version }}.rpi.tar to / (rpi) + unarchive: + src: http://download.iiab.io/packages/php-stem{{ php_version }}.rpi.tar + dest: / + owner: root + group: root + #mode: ???? + remote_src: yes + when: is_rpi | bool + +- name: Unarchive http://download.iiab.io/packages/php-stem{{ php_version }}.x64.tar to / (x64) + unarchive: + src: http://download.iiab.io/packages/php-stem{{ php_version }}.x64.tar + dest: / + owner: root + group: root + #mode: ???? + remote_src: yes + when: ansible_machine == "x86_64" + +- name: Create softlink osm.conf from sites-enabled to sites-available (debuntu) + file: + src: "/etc/php/{{ php_version }}/mods-available/stem.ini" + path: "/etc/php/{{ php_version }}/fpm/conf.d/20-stem.ini" + state: link + when: nginx_enabled + +- name: Restart php{{ php_version }}-fpm service + service: + name: "php{{ php_version }}-fpm" + state: restarted + when: nginx_enabled + +# Not sure what to do for apache, so do nothing for now + +# The following are probably no longer true 2020-01025 +# Presumably fails on Debian 8 & 10? +# Fails on Debian i686 as of 2018-08-07: https://github.com/iiab/iiab/issues/983 +# Fails on Ubuntu 18.04 as of 2018-07-28: https://github.com/iiab/iiab/issues/829 diff --git a/roles/httpd/tasks/php-stem.yml.deprecated b/roles/httpd/tasks/php-stem.yml.deprecated deleted file mode 100644 index ad943f436..000000000 --- a/roles/httpd/tasks/php-stem.yml.deprecated +++ /dev/null @@ -1,35 +0,0 @@ -# Fixes search @ http://box/modules/es-wikihow (popular with Spanish youth) -# Source code: http://download.iiab.io/packages/php-stem.src.tar -# June 2018 debugging & compilation thanks to Tim Moody & George Hunt -# Original bug: https://github.com/iiab/iiab/issues/829 - -#- name: Download php-stem.rpi.tar -# command: cd /; wget http://download.iiab.io/packages/php-stem.rpi.tar -# when: is_rpi | bool - -#- name: Download php-stem.x86.tar -# command: cd /; wget http://download.iiab.io/packages/php-stem.x64.tar -# when: not is_rpi - -- name: Unarchive http://download.iiab.io/packages/php-stem.rpi.tar to / (rpi) - unarchive: - src: http://download.iiab.io/packages/php-stem.rpi.tar - dest: / - owner: root - group: root - #mode: ???? - remote_src: yes - when: is_rpi | bool - -- name: Unarchive http://download.iiab.io/packages/php-stem.x64.tar to / (debian-9 on x86_64 only) - unarchive: - src: http://download.iiab.io/packages/php-stem.x64.tar - dest: / - owner: root - group: root - #mode: ???? - remote_src: yes - when: is_debian_9 and (ansible_machine == "x86_64") -# Presumably fails on Debian 8 & 10? -# Fails on Debian i686 as of 2018-08-07: https://github.com/iiab/iiab/issues/983 -# Fails on Ubuntu 18.04 as of 2018-07-28: https://github.com/iiab/iiab/issues/829 From 778b2dc42d8b5ac099e6b5e509bf8fbf8ac06261 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sat, 25 Jan 2020 14:47:23 -0500 Subject: [PATCH 2/4] php version in wrong spot --- roles/httpd/tasks/php-stem.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index 8c03c869e..1c5ced214 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/roles/httpd/tasks/php-stem.yml @@ -3,9 +3,9 @@ # June 2018 debugging & compilation thanks to Tim Moody & George Hunt # Original bug: https://github.com/iiab/iiab/issues/829 -- name: Unarchive http://download.iiab.io/packages/php-stem{{ php_version }}.rpi.tar to / (rpi) +- name: Unarchive http://download.iiab.io/packages/php{{ php_version }}-stem.rpi.tar to / (rpi) unarchive: - src: http://download.iiab.io/packages/php-stem{{ php_version }}.rpi.tar + src: http://download.iiab.io/packages/php{{ php_version }}-stem.rpi.tar dest: / owner: root group: root @@ -13,9 +13,9 @@ remote_src: yes when: is_rpi | bool -- name: Unarchive http://download.iiab.io/packages/php-stem{{ php_version }}.x64.tar to / (x64) +- name: Unarchive http://download.iiab.io/packages/php{{ php_version }}-stem.x64.tar to / (x64) unarchive: - src: http://download.iiab.io/packages/php-stem{{ php_version }}.x64.tar + src: http://download.iiab.io/packages/php{{ php_version }}-stem.x64.tar dest: / owner: root group: root @@ -23,7 +23,7 @@ remote_src: yes when: ansible_machine == "x86_64" -- name: Create softlink osm.conf from sites-enabled to sites-available (debuntu) +- name: Create softlink 20-stem.ini to /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" From 2d722f516829f5c0a5ef97f87846d3a49a6e7e80 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sat, 25 Jan 2020 15:03:01 -0500 Subject: [PATCH 3/4] wait for php-fpm to be installed --- roles/httpd/tasks/php-stem.yml | 13 +------------ roles/nginx/tasks/install.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index 1c5ced214..bcca59d1d 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/roles/httpd/tasks/php-stem.yml @@ -23,18 +23,7 @@ remote_src: yes when: ansible_machine == "x86_64" -- name: Create softlink 20-stem.ini to /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: nginx_enabled - -- name: Restart php{{ php_version }}-fpm service - service: - name: "php{{ php_version }}-fpm" - state: restarted - when: nginx_enabled +# link to php done in nginx when php-fpm is installed # Not sure what to do for apache, so do nothing for now diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index d59224e0f..710b16eb4 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -28,6 +28,21 @@ - { src: 'roles/nginx/templates/nginx.conf.j2', dest: '/etc/nginx/nginx.conf' } - { src: 'roles/nginx/templates/ports.conf.j2', dest: '/etc/{{ apache_service }}/ports.conf' } +# php stem extension is installed in role httpd +# here it is linked to php-fpm +- name: Create softlink 20-stem.ini to /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: nginx_enabled + +- name: Restart php{{ php_version }}-fpm service + service: + name: "php{{ php_version }}-fpm" + state: restarted + when: nginx_enabled + - name: "Add 'nginx_installed: True' to {{ iiab_state_file }}" lineinfile: dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml From de077d69691adf6a2cb7716e463de3775dd3e652 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sat, 25 Jan 2020 15:32:07 -0500 Subject: [PATCH 4/4] fix comment --- roles/httpd/tasks/php-stem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index bcca59d1d..395c69378 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/roles/httpd/tasks/php-stem.yml @@ -27,7 +27,7 @@ # Not sure what to do for apache, so do nothing for now -# The following are probably no longer true 2020-01025 +# The following are probably no longer true 2020-01-25 # Presumably fails on Debian 8 & 10? # Fails on Debian i686 as of 2018-08-07: https://github.com/iiab/iiab/issues/983 # Fails on Ubuntu 18.04 as of 2018-07-28: https://github.com/iiab/iiab/issues/829