Merge branch 'main' of git.coop:webarch/php

.gitlab-ci.yml

@@ -30,7 +30,7 @@ stages:
   - bookworm
   # - bullseye
 bookworm:
-  image: registry.git.coop/webarch/containers/images/bookworm:20231016
+  image: registry.git.coop/webarch/containers/images/bookworm:20231119
   stage: bookworm
   script:
     - molecule test --all

tasks/pkg.yml

@@ -155,6 +155,17 @@
         ( ( php_packages_removed_first_run.changed is defined ) and ( php_packages_removed_first_run.changed | bool ) ) or
         ( ( php_packages_removed_second_run.changed is defined ) and ( php_packages_removed_second_run.changed | bool ) ) )
 
+    - name: Ensure that all required PHP packages are present
+      ansible.builtin.apt:
+        pkg: "{{ php_pkg_present }}"
+        state: latest
+        dpkg_options: force-confmiss
+        update_cache: true
+      environment:
+        UCF_FORCE_CONFFMISS: "1"
+      when: php_pkg_present != []
+      register: php_packages_present
+
     - name: Re-read local facts after updating PHP packages
       ansible.builtin.setup:
         filter: ansible_local
@@ -168,7 +179,9 @@
         ( ( php_dist_upgrade.changed is defined ) and
         ( php_dist_upgrade.changed | bool ) ) or
         ( ( php_apt_clean.changed is defined ) and
-        ( php_apt_clean.changed | bool ) )
+        ( php_apt_clean.changed | bool ) ) or
+        ( ( php_packages_present.changed is defined ) and
+        ( php_packages_present.changed | bool ) )
 
     - name: Set facts for PHP-FPM versions present
       ansible.builtin.set_fact:

tasks/sapi.yml

@@ -79,9 +79,9 @@
 
         - name: "{{ php_task_name }}"
           ansible.builtin.debug:
-            var: php_mods_proposed
+            var: php_mods_enable
           vars:
-            php_task_name: "Debug PHP {{ php_version.version }} mods proposed"
+            php_task_name: "Debug PHP {{ php_version.version }} mods enable"
 
         - name: Fail as mods to be enabled are not available
           ansible.builtin.fail: