Make local dev with molecule a little easier.

add option to set pm.status_path

.github/stale.yml

@@ -1,57 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 90
-
-# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 30
-
-# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
-onlyLabels: []
-
-# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
-exemptLabels:
-  - bug
-  - pinned
-  - security
-  - planned
-
-# Set to true to ignore issues in a project (defaults to false)
-exemptProjects: false
-
-# Set to true to ignore issues in a milestone (defaults to false)
-exemptMilestones: false
-
-# Set to true to ignore issues with an assignee (defaults to false)
-exemptAssignees: false
-
-# Label to use when marking as stale
-staleLabel: stale
-
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 30
-
-pulls:
-  markComment: |-
-    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
-
-    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
-
-  unmarkComment: >-
-    This pull request is no longer marked for closure.
-
-  closeComment: >-
-    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
-
-issues:
-  markComment: |-
-    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
-
-    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
-
-  unmarkComment: >-
-    This issue is no longer marked for closure.
-
-  closeComment: >-
-    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.

.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'
 
@@ -41,37 +41,34 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: centos8
+          - distro: rockylinux8
             playbook: converge.yml
-          - distro: centos7
+          - distro: ubuntu2204
             playbook: converge.yml
           - distro: ubuntu2004
             playbook: converge.yml
-          - distro: ubuntu1804
+          - distro: debian12
             playbook: converge.yml
           - distro: debian11
             playbook: converge.yml
-          - distro: debian10
-            playbook: converge.yml
-          - distro: debian9
-            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.
-        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'
 
       - 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

.github/workflows/release.yml

@@ -22,17 +22,19 @@ 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'
 
       - name: Install Ansible.
-        run: pip3 install ansible-base
+        run: pip3 install ansible-core
 
       - name: Trigger a new import on Galaxy.
-        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
+        run: >-
+          ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }}
+          $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)

.github/workflows/stale.yml

@@ -0,0 +1,34 @@
+---
+name: Close inactive issues
+'on':
+  schedule:
+    - cron: "55 10 * * 6"  # semi-random time
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v8
+        with:
+          days-before-stale: 120
+          days-before-close: 60
+          exempt-issue-labels: bug,pinned,security,planned
+          exempt-pr-labels: bug,pinned,security,planned
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+          stale-issue-message: |
+            This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+            
+            Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+          close-issue-message: |
+            This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
+          stale-pr-message: |
+            This pr has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+            
+            Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+          close-pr-message: |
+            This pr has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.yamllint

@@ -7,5 +7,4 @@ rules:
     level: warning
 
 ignore: |
-  .github/stale.yml
-  .travis.yml
+  .github/workflows/stale.yml

README.md

@@ -83,6 +83,7 @@ The handler restarts PHP-FPM by default. Setting the value to `reloaded` will re
         pool_pm_min_spare_servers: 1
         pool_pm_max_spare_servers: 3
         pool_pm_max_requests: 500
+        pool_pm_status_path: /status
 
 List of PHP-FPM pool to create. By default, www pool is created. To setup a new pool, add an item to php_fpm_pools list.
 

defaults/main.yml

@@ -31,6 +31,7 @@ php_fpm_pm_start_servers: 5
 php_fpm_pm_min_spare_servers: 5
 php_fpm_pm_max_spare_servers: 5
 php_fpm_pm_max_requests: 0
+php_fpm_pm_status_path: ""
 
 # PHP-FPM pool configuration.
 php_fpm_pools:
@@ -43,7 +44,8 @@ php_fpm_pools:
     pool_pm_start_servers: "{{ php_fpm_pm_start_servers }}"
     pool_pm_min_spare_servers: "{{ php_fpm_pm_min_spare_servers }}"
     pool_pm_max_spare_servers: "{{ php_fpm_pm_max_spare_servers }}"
-    pool_php_fpm_pm_max_requests: "{{ php_fpm_pm_max_requests }}"
+    pool_pm_max_requests: "{{ php_fpm_pm_max_requests }}"
+    pool_pm_status_path: "{{ php_fpm_pm_status_path }}"
 
 # The executable to run when calling PHP from the command line.
 php_executable: "php"
@@ -106,7 +108,7 @@ php_display_startup_errors: "Off"
 
 # Install PHP from source (instead of using a package manager) with these vars.
 php_install_from_source: false
-php_source_repo: "https://git.php.net/repository/php-src.git"
+php_source_repo: "https://github.com/php/php-src.git"
 php_source_version: "master"
 php_source_clone_dir: "~/php-src"
 php_source_clone_depth: 1

handlers/main.yml

@@ -13,3 +13,4 @@
   when:
     - php_enable_php_fpm
     - php_fpm_state == 'started'
+    - not ansible_check_mode

meta/main.yml

@@ -7,12 +7,8 @@ galaxy_info:
   description: PHP for RedHat/CentOS/Fedora/Debian/Ubuntu.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.8
+  min_ansible_version: 2.10
   platforms:
-    - name: EL
-      versions:
-        - 7
-        - 8
     - name: Fedora
       versions:
         - all
@@ -21,9 +17,7 @@ galaxy_info:
         - all
     - name: Ubuntu
       versions:
-        - trusty
-        - xenial
-        - bionic
+        - all
   galaxy_tags:
     - development
     - web

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:
@@ -17,21 +17,18 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=true cache_valid_time=600
+      apt:
+        update_cache: true
+        cache_valid_time: 600
       when: ansible_os_family == 'Debian'
       changed_when: false
 
-    # Ubuntu-specific tasks.
     - name: Ensure dirmngr is installed (gnupg dependency).
       apt:
         name: dirmngr
         state: present
       when: ansible_os_family == 'Debian'
 
-    - name: Add repository for PHP 7.
-      apt_repository: repo='ppa:ondrej/php'
-      when: ansible_distribution == 'Ubuntu'
-
     # Debian-specific tasks.
     - name: Add dependencies for PHP versions (Debian).
       apt:
@@ -42,6 +39,11 @@
         state: present
       when: ansible_distribution == "Debian"
 
+    - name: Add Ondrej Sury's repo for PHP 8 (Ubuntu).
+      apt_repository:
+        repo: 'ppa:ondrej/php'
+      when: ansible_distribution == 'Ubuntu'
+
     - name: Add Ondrej Sury's apt key (Debian).
       apt_key:
         url: https://packages.sury.org/php/apt.gpg

molecule/default/molecule.yml

@@ -1,14 +1,18 @@
 ---
+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:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
 provisioner:

tasks/configure-fpm.yml

@@ -50,4 +50,7 @@
     name: "{{ php_fpm_daemon }}"
     state: "{{ php_fpm_state }}"
     enabled: "{{ php_fpm_enabled_on_boot }}"
-  when: php_enable_php_fpm and ansible_distribution != "Debian"
+  when:
+    - php_enable_php_fpm
+    - ansible_distribution != "Debian"
+    - not ansible_check_mode

tasks/configure.yml

@@ -1,16 +1,16 @@
 ---
 - name: Ensure configuration directories exist.
-  file:
+  ansible.builtin.file:
     path: "{{ item }}"
     state: directory
     follow: true
     mode: 0755
-  with_flattened:
-    - "{{ php_conf_paths }}"
-    - "{{ php_extension_conf_paths }}"
+  with_items:
+    - "{{ php_conf_paths | flatten }}"
+    - "{{ php_extension_conf_paths | flatten }}"
 
 - name: Place PHP configuration file in place.
-  template:
+  ansible.builtin.template:
     src: php.ini.j2
     dest: "{{ item }}/php.ini"
     owner: root

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

tasks/main.yml

@@ -1,5 +1,8 @@
 ---
 # Variable setup.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
 - name: Include distribution and version-specific vars.
   include_vars: "{{ item }}"
   with_first_found:
@@ -12,8 +15,15 @@
     php_default_version_debian: "{{ __php_default_version_debian }}"
   when: php_default_version_debian is not defined and ansible_os_family == 'Debian'
 
-- name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
+- name: Define the name of the JSON extension package on Debian for PHP <8.
+  set_fact:
+    __php_json_package_debian: "{{ 'php' + php_default_version_debian + '-json' }}"
+  when: ansible_os_family == 'Debian' and php_default_version_debian is version('8.0', '<')
+
+- name: Add the JSON extension on Debian for PHP <8.
+  set_fact:
+    __php_packages: "{{ __php_packages + [__php_json_package_debian] }}"
+  when: __php_json_package_debian is defined and __php_json_package_debian not in __php_packages
 
 - name: Define php_packages.
   set_fact:

templates/www.conf.j2

@@ -1,4 +1,4 @@
-; {{ ansible_managed }}
+{{ ansible_managed | comment(decoration='; ') }}
 
 [{{ item.pool_name | mandatory }}]
 listen = {{ item.pool_listen | mandatory }}
@@ -15,3 +15,6 @@ pm.start_servers = {{ item.pool_pm_start_servers | default(5, true) }}
 pm.min_spare_servers = {{ item.pool_pm_min_spare_servers | default(5, true) }}
 pm.max_spare_servers = {{ item.pool_pm_max_spare_servers | default(5, true) }}
 pm.max_requests = {{ item.pool_pm_max_requests | default(500, true) }}
+{% if item.pool_pm_status_path|length %}
+pm.status_path = {{ item.pool_pm_status_path }}
+{% endif %}

vars/Debian-12.yml

@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "8.2"

vars/Debian-9.yml

@@ -1,2 +0,0 @@
----
-__php_default_version_debian: "7.0"

vars/Debian.yml

@@ -1,6 +1,5 @@
 ---
 __php_default_version_debian: "7.0"
-
 __php_packages:
   - php{{ php_default_version_debian }}-common
   - php{{ php_default_version_debian }}-cli
@@ -10,12 +9,12 @@ __php_packages:
   - php{{ php_default_version_debian }}-gd
   - php{{ php_default_version_debian }}-curl
   - php{{ php_default_version_debian }}-imap
-  - php{{ php_default_version_debian }}-json
   - php{{ php_default_version_debian }}-opcache
   - php{{ php_default_version_debian }}-xml
   - php{{ php_default_version_debian }}-mbstring
-  - php-sqlite3
-  - php-apcu
+  - php{{ php_default_version_debian }}-apcu
+  - php{{ php_default_version_debian }}-sqlite3
+
 __php_webserver_daemon: "apache2"
 
 # Vendor-specific configuration paths on Debian/Ubuntu make my brain asplode.

vars/Ubuntu-16.yml

@@ -1,2 +0,0 @@
----
-__php_default_version_debian: "7.0"

vars/Ubuntu-22.yml

@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "8.1"