Merge remote-tracking branch 'upstream/master'

.github/workflows/ci.yml

@@ -43,8 +43,6 @@ jobs:
         include:
           - distro: rockylinux8
             playbook: converge.yml
-          - distro: centos7
-            playbook: converge.yml
           - distro: ubuntu2004
             playbook: converge.yml
           - distro: ubuntu1804
@@ -54,8 +52,9 @@ jobs:
           - distro: debian10
             playbook: converge.yml
 
-          - distro: centos7
-            playbook: source-install.yml
+          # Had some trouble, might fix later.
+          # - distro: debian11
+          #   playbook: source-install.yml
 
     steps:
       - name: Check out the codebase.
@@ -69,7 +68,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install ansible molecule[docker] docker
+        run: pip3 install ansible molecule molecule-plugins[docker] docker
 
       - name: Run Molecule tests.
         run: molecule test

molecule/default/converge.yml

@@ -7,7 +7,7 @@
     php_enable_webserver: false
     php_enable_php_fpm: true
     php_memory_limit: "192M"
-    php_enablerepo: "remi,remi-php70"
+    php_enablerepo: "remi,remi-php82"
     php_install_recommends: false
 
   handlers:
@@ -28,7 +28,7 @@
         state: present
       when: ansible_os_family == 'Debian'
 
-    - name: Add repository for PHP 7.
+    - name: Add repository for PHP 8.
       apt_repository: repo='ppa:ondrej/php'
       when: ansible_distribution == 'Ubuntu'
 

molecule/default/molecule.yml

@@ -9,7 +9,8 @@ platforms:
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
 provisioner:

tasks/install-from-source.yml

@@ -54,7 +54,7 @@
       - libfreetype6-dev
       - libgmp3-dev
       - libmcrypt-dev
-      - libmariadbclient-dev
+      - libmariadb-dev
       - libpspell-dev
       - librecode-dev
       - libssl-dev