Merge pull request #2198 from tim-moody/php-stem

Php stem

roles/httpd/tasks/main.yml

@@ -11,12 +11,7 @@
 
 - include_tasks: install.yml
 - include_tasks: html.yml
-
+- include_tasks: php-stem.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
 
 - 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:

roles/httpd/tasks/php-stem.yml

@@ -3,17 +3,9 @@
 # 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
+- name: Unarchive http://download.iiab.io/packages/php{{ php_version }}-stem.rpi.tar to / (rpi)
-#  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
+    src: http://download.iiab.io/packages/php{{ php_version }}-stem.rpi.tar
     dest: /
     owner: root
     group: root
@@ -21,15 +13,21 @@
     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)
+- name: Unarchive http://download.iiab.io/packages/php{{ php_version }}-stem.x64.tar to / (x64)
   unarchive:
-    src: http://download.iiab.io/packages/php-stem.x64.tar
+    src: http://download.iiab.io/packages/php{{ php_version }}-stem.x64.tar
     dest: /
     owner: root
     group: root
     #mode: ????
     remote_src: yes
-  when: is_debian_9 and (ansible_machine == "x86_64")
+  when: ansible_machine == "x86_64"
+
+# link to php done in nginx when php-fpm is installed
+
+# Not sure what to do for apache, so do nothing for now
+
+# 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

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