Update PHP role to latest version.

Author: geerlingguy

provisioning/requirements.yml

@@ -43,7 +43,7 @@ roles:
  - name: geerlingguy.nodejs
  version: 5.1.1
  - name: geerlingguy.php
- version: 4.5.1
+ version: 4.6.1
  - name: geerlingguy.php-memcached
  version: 2.0.2
  - name: geerlingguy.php-mysql

provisioning/roles/geerlingguy.php/.ansible-lint

@@ -1,5 +1,5 @@
 skip_list:
- - '306'
- - '405'
- - '503'
- - '106'
+ - 'yaml'
+ - 'risky-shell-pipe'
+ - 'no-handler'
+ - 'role-name'

provisioning/roles/geerlingguy.php/.github/workflows/ci.yml

@@ -0,0 +1,80 @@
+---
+name: CI
+'on':
+ pull_request:
+ push:
+ branches:
+ - master
+ schedule:
+ - cron: "0 4 * * 4"
+
+defaults:
+ run:
+ working-directory: 'geerlingguy.php'
+
+jobs:
+
+ lint:
+ name: Lint
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out the codebase.
+ uses: actions/checkout@v2
+ with:
+ path: 'geerlingguy.php'
+
+ - name: Set up Python 3.
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.x'
+
+ - name: Install test dependencies.
+ run: pip3 install yamllint
+
+ - name: Lint code.
+ run: |
+ yamllint .
+
+ molecule:
+ name: Molecule
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ include:
+ - distro: centos8
+ playbook: converge.yml
+ - distro: centos7
+ playbook: converge.yml
+ - distro: ubuntu2004
+ playbook: converge.yml
+ - distro: ubuntu1804
+ playbook: converge.yml
+ - distro: debian10
+ playbook: converge.yml
+ - distro: debian9
+ playbook: converge.yml
+
+ - distro: centos7
+ playbook: source-install.yml
+
+ steps:
+ - name: Check out the codebase.
+ uses: actions/checkout@v2
+ with:
+ path: 'geerlingguy.php'
+
+ - name: Set up Python 3.
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.x'
+
+ - name: Install test dependencies.
+ run: pip3 install ansible molecule[docker] docker
+
+ - name: Run Molecule tests.
+ run: molecule test
+ env:
+ PY_COLORS: '1'
+ ANSIBLE_FORCE_COLOR: '1'
+ MOLECULE_DISTRO: ${{ matrix.distro }}
+ MOLECULE_PLAYBOOK: ${{ matrix.playbook }}

provisioning/roles/geerlingguy.php/.github/workflows/release.yml

@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+ push:
+ tags:
+ - '*'
+
+defaults:
+ run:
+ working-directory: 'geerlingguy.php'
+
+jobs:
+
+ release:
+ name: Release
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out the codebase.
+ uses: actions/checkout@v2
+ with:
+ path: 'geerlingguy.php'
+
+ - name: Set up Python 3.
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.x'
+
+ - name: Install Ansible.
+ run: pip3 install ansible-base
+
+ - 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)

provisioning/roles/geerlingguy.php/.gitignore

@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+

provisioning/roles/geerlingguy.php/.travis.yml

@@ -1,6 +1,6 @@
 # Ansible Role: PHP
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php)
+[![CI](https://github.com/geerlingguy/ansible-role-php/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-php/actions?query=workflow%3ACI)
 
 Installs PHP on RedHat/CentOS and Debian/Ubuntu servers.
 
@@ -71,14 +71,22 @@ Control over the fpm daemon's state; set these to `stopped` and `false` if you w
 
 The handler restarts PHP-FPM by default. Setting the value to `reloaded` will reload the service, intead of restarting it.
 
- php_fpm_listen: "127.0.0.1:9000"
- php_fpm_listen_allowed_clients: "127.0.0.1"
- php_fpm_pm_max_children: 50
- php_fpm_pm_start_servers: 5
- php_fpm_pm_min_spare_servers: 5
- php_fpm_pm_max_spare_servers: 5
 
-Specific settings inside the default `www.conf` PHP-FPM pool. If you'd like to manage additional settings, you can do so either by replacing the file with your own template or using `lineinfile` like this role does inside `tasks/configure-fpm.yml`.
+ php_fpm_pools:
+  - pool_name: www
+  pool_template: www.conf.j2
+  pool_listen: "127.0.0.1:9000"
+  pool_listen_allowed_clients: "127.0.0.1"
+  pool_pm: dynamic
+  pool_pm_max_children: 5
+  pool_pm_start_servers: 2
+  pool_pm_min_spare_servers: 1
+  pool_pm_max_spare_servers: 3
+  pool_pm_max_requests: 500
+
+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.
+
+Specific settings inside the default `www.conf.j2` PHP-FPM pool. If you'd like to manage additional settings, you can do so either by replacing the file with your own template using `pool_template`.
 
 ### php.ini settings
 

provisioning/roles/geerlingguy.php/README.md

@@ -30,6 +30,20 @@ php_fpm_pm_max_children: 50
 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 pool configuration.
+php_fpm_pools:
+ - pool_name: www
+ pool_template: www.conf.j2
+ pool_listen: "{{ php_fpm_listen }}"
+ pool_listen_allowed_clients: "{{ php_fpm_listen_allowed_clients }}"
+ pool_pm: dynamic
+ pool_pm_max_children: "{{ php_fpm_pm_max_children }}"
+ 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 }}"
 
 # The executable to run when calling PHP from the command line.
 php_executable: "php"

provisioning/roles/geerlingguy.php/defaults/main.yml

@@ -11,7 +11,6 @@ galaxy_info:
  platforms:
  - name: EL
  versions:
- - 6
  - 7
  - 8
  - name: Fedora

provisioning/roles/geerlingguy.php/meta/main.yml

@@ -3,10 +3,6 @@ dependency:
  name: galaxy
 driver:
  name: docker
-lint: |
- set -e
- yamllint .
- ansible-lint
 platforms:
  - name: instance
  image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"