Merge pull request #3085 from holta/php-stem-cleaner

roles/www_base: Cleaner/Safer php-stem

roles/www_base/tasks/main.yml

@@ -22,13 +22,14 @@
 #      - php{{ php_version }}-xmlrpc    # 2021-06-27: Experimentally remove -- SEE EXPLANATION IN moodle/tasks/main.yml
 #    state: present
 
-- name: Using html.yml
+- name: Install html.yml
   include_tasks: html.yml
 
-- name: "Using php-stem.yml, when: php_version == 7.4"
+- name: Install php-stem.yml if php_version == 7.4 and (ansible_machine == "armv6l" or ansible_machine == "armv7l" or ansible_machine == "aarch64" or ansible_machine == "x86_64")
   include_tasks: php-stem.yml
-  when: php_version == 7.4    # or php_version == 8.0 or php_version == 8.1 (IIAB MIGHT SUPPORT THESE LATER IN 2022)
-                              # or php_version == 7.2 or php_version == 7.3 (PROBABLY WORK, AT YOUR OWN RISK!)
+  when: php_version == 7.4 and (ansible_machine == "armv6l" or ansible_machine == "armv7l" or ansible_machine == "aarch64" or ansible_machine == "x86_64")
+   # or php_version == 8.0 or php_version == 8.1 (IIAB MIGHT SUPPORT THESE LATER IN 2022)
+   # or php_version == 7.2 or php_version == 7.3 (PROBABLY WORK, AT YOUR OWN RISK!)
 
 - 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:

roles/www_base/tasks/php-stem.yml

@@ -22,7 +22,7 @@
       8.0: 20200930
       8.1: 20210902
 
-- name: Set php_extension to "{{ php_extensions[php_version] }}" using php_extensions[php_version]
+- name: Set php_extension to "{{ php_extensions[php_version] }}" using php_extensions[php_version is "{{ php_version }}"]
   set_fact:
     php_extension: "{{ php_extensions[php_version] }}"
 
@@ -41,30 +41,27 @@
 # Then put that location in stem.ini"
 
 
-- name: Download https://github.com/iiab/php-stem/raw/main/so/stem-armhf-{{ php_version }}.so to /usr/lib/php/{{ php_extension }}/stem.so (armv6l or armv7l)
+- name: Populate php_stem_arches dictionary (lookup table of CPU architectures for https://github.com/iiab/php-stem/raw/main/so/stem-[ARCH]-[PHP VERSION].so)
+  set_fact:
+    php_stem_arches:
+      armv6l: armhf
+      armv7l: armhf
+      aarch64: aarch64
+      x86_64: x86
+
+- name: Set php_stem_arch to "{{ php_stem_arches[ansible_machine] }}" using php_stem_arches[ansible_machine is "{{ ansible_machine }}"]
+  set_fact:
+    php_stem_arch: "{{ php_stem_arches[ansible_machine] }}"
+
+
+- name: Download https://github.com/iiab/php-stem/raw/main/so/stem-{{ php_stem_arch }}-{{ php_version }}.so to /usr/lib/php/{{ php_extension }}/stem.so
   get_url:
-    url: https://github.com/iiab/php-stem/raw/main/so/stem-armhf-{{ php_version }}.so
+    url: https://github.com/iiab/php-stem/raw/main/so/stem-{{ php_stem_arch }}-{{ php_version }}.so
     dest: /usr/lib/php/{{ php_extension }}/stem.so
     timeout: "{{ download_timeout }}"
-  when: ansible_machine == "armv6l" or ansible_machine == "armv7l"
-
-- name: Download https://github.com/iiab/php-stem/raw/main/so/stem-aarch64-{{ php_version }}.so to /usr/lib/php/{{ php_extension }}/stem.so (aarch64)
-  get_url:
-    url: https://github.com/iiab/php-stem/raw/main/so/stem-aarch64-{{ php_version }}.so
-    dest: /usr/lib/php/{{ php_extension }}/stem.so
-    timeout: "{{ download_timeout }}"
-  when: ansible_machine == "aarch64"
-
-- name: Download https://github.com/iiab/php-stem/raw/main/so/stem-x64-{{ php_version }}.so to /usr/lib/php/{{ php_extension }}/stem.so (x86_64)
-  get_url:
-    url: https://github.com/iiab/php-stem/raw/main/so/stem-x64-{{ php_version }}.so
-    dest: /usr/lib/php/{{ php_extension }}/stem.so
-    timeout: "{{ download_timeout }}"
-  when: ansible_machine == "x86_64"
-
 
 # https://en.wikipedia.org/wiki/Here_document
-- name: Install /etc/php/{{ php_version }}/mods-available/stem.ini
+- name: Install "extension=stem.so" in /etc/php/{{ php_version }}/mods-available/stem.ini
   shell: |
     cat > /etc/php/{{ php_version }}/mods-available/stem.ini << EOF
     ; configuration for php common module