Merge 03e012eeec into 51684c4c27

.github/workflows/ci.yml

@@ -19,12 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: 'geerlingguy.php'
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -47,8 +47,6 @@ jobs:
             playbook: converge.yml
           - distro: ubuntu2004
             playbook: converge.yml
-          - distro: ubuntu1804
-            playbook: converge.yml
           - distro: debian12
             playbook: converge.yml
           - distro: debian11
@@ -60,12 +58,12 @@ jobs:
 
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: 'geerlingguy.php'
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

.github/workflows/release.yml

@@ -22,12 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: 'geerlingguy.php'
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

defaults/main.yml

@@ -69,6 +69,10 @@ php_enable_apc: true
 php_apc_shm_size: "96M"
 php_apc_enable_cli: "0"
 
+# Manage PHP CLI memory limit.
+php_set_cli_memory_limit: false
+php_cli_memory_limit: "512M"
+
 # If this is set to false, none of the following options will have any effect.
 # Any and all changes to /etc/php.ini will be your responsibility.
 php_use_managed_ini: true

molecule/default/molecule.yml

@@ -2,11 +2,13 @@
 role_name_check: 1
 dependency:
   name: galaxy
+  options:
+    ignore-errors: true
 driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux8}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw

tasks/configure-cli.yml

@@ -0,0 +1,14 @@
+---
+
+- name: Set PHP CLI memory limit.
+  block:
+    - name: Ensure PHP CLI config directory exists.
+      file:
+        dest: "/etc/php/{{ php_default_version_debian }}/cli/conf.d/"
+        state: directory
+    - name: Set PHP CLI memory limit.
+      template:
+        src: memory_limit.ini.j2
+        dest: "/etc/php/{{ php_default_version_debian }}/cli/conf.d/20-memory_limit.ini"
+  become: true
+  when: php_set_cli_memory_limit | bool

tasks/main.yml

@@ -85,3 +85,4 @@
 - include_tasks: configure-apcu.yml
 - include_tasks: configure-opcache.yml
 - include_tasks: configure-fpm.yml
+- include_tasks: configure-cli.yml

templates/memory_limit.ini.j2

@@ -0,0 +1,5 @@
+; {{ ansible_managed }}
+
+; configuration for increasing PHP CLI memory limit
+; priority=20
+memory_limit = {{ php_cli_memory_limit }}