Quickfix

- Store configuration in local facts
- Better socket generator
- php_admin_value/php_value
- Manages PHP 7.4 on Debian

.gitignore

@@ -2,3 +2,5 @@
 *.swp
 *.retry
 *.log
+/filter_plugins/*.pyc
+/filter_plugins/__pycache__

.travis.yml

@@ -1,26 +1,23 @@
 env:
-  - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.0,<2.1'
-  - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.0,<2.1'
-  - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.1,<2.2'
-  - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.1,<2.2'
-  - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.2,<2.3'
-  - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.2,<2.3'
-  - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.3,<2.4'
-  - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.3,<2.4'
-  - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.0,<2.1'
-  - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.1,<2.2'
-  - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.2,<2.3'
-  - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.3,<2.4'
-  - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.0,<2.1'
-  - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.1,<2.2'
-  - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.2,<2.3'
-  - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.3,<2.4'
+  - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-debian-buster-php73' ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-debian-stretch-php74' ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-debian-buster-php73' ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-debian-buster-php74' ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-ubuntu-bionic-php72' ANSIBLE_VERSION='ansible>=2.7,<2.8'
 
 sudo: required
 
 dist: trusty
 
 language: python
+python: 2.7
 
 services:
   - docker

README.md

@@ -3,21 +3,21 @@ Ansible PHP (+FPM) role for Debian / Ubuntu / FreeBSD
 
 [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-HanXHX.php-blue.svg)](https://galaxy.ansible.com/HanXHX/php) [![Build Status](https://travis-ci.org/HanXHX/ansible-php.svg?branch=master)](https://travis-ci.org/HanXHX/ansible-php)
 
-Install PHP (php-fpm optional) on Debian / Ubuntu. Manage APCu, Opcache, Xdebug.
+Install PHP on Debian / Ubuntu / FreeBSD. Manage PHP-FPM, APCu, Opcache and Xdebug.
 
 Managed OS / Versions
 ---------------------
 
-|         OS            |   PHP 7.0    |    PHP 7.1    |    PHP 7.2   |
-|:---------------------:|:------------:|:-------------:|:------------:|
-| Debian Strech (9)     | Yes          | Yes (Sury)    | Yes (Sury)   |
-| Ubuntu Xenial (16.04) | Yes          | No            | No           |
-| Ubuntu Bionic (18.04) | No           | No            | Yes          |
-| FreeBSD 11            | Yes          | Yes           | Yes          |
-| FreeBSD 12            | Yes          | Yes           | Yes          |
+|         OS            |       PHP 7.0       |          PHP 7.1           |          PHP 7.2           |           PHP 7.3         |           PHP 7.4         |
+|:---------------------:|:-------------------:|:--------------------------:|:--------------------------:|:-------------------------:|:--------------------------:
+| Debian Stretch (9)    | :heavy_check_mark:  | :heavy_check_mark: (Sury)  | :heavy_check_mark: (Sury)  | :heavy_check_mark: (Sury) | :heavy_check_mark: (Sury) |
+| Debian Buster (10)    | :x:                 | :x:                        | :x:                        | :heavy_check_mark:        | :heavy_check_mark: (Sury) |
+| Ubuntu Xenial (16.04) | :heavy_check_mark:  | :x:                        | :x:                        | :x:                       | :x:                       |
+| Ubuntu Bionic (18.04) | :x:                 | :x:                        | :heavy_check_mark:         | :x:                       | :x:                       |
+| FreeBSD 11            | :heavy_check_mark:  | :heavy_check_mark:         | :heavy_check_mark:         | :heavy_check_mark:        | Need tests...             |
+| FreeBSD 12            | :heavy_check_mark:  | :heavy_check_mark:         | :heavy_check_mark:         | :heavy_check_mark:        | Need tests...             |
 
 Links:
-- [Dotdeb](https://www.dotdeb.org)
 - [Sury](https://deb.sury.org/)
 
 Requirements
@@ -25,12 +25,11 @@ Requirements
 
 If you need PHP-FPM, you must install a webserver with FastCGI support. You can use my [nginx role](https://github.com/HanXHX/ansible-nginx).
 
-
 FreeBSD limitations
 -------------------
 
 - It doesn't split ini file for FPM/CLI. It's hardcoded as `/usr/local/etc/php.ini`.
-- It can't manage multiple PHP versions at the time (like old Debian versions)
+- It can't manage multiple PHP versions at the time (like legacy Debian versions)
 - You must explicitely set xdebug package name (use `pkg search xdebug` to find the good one)
 
 Role Variables
@@ -40,7 +39,7 @@ You should look at [default vars](defaults/main.yml).
 
 ### Writable vars
 
-- `php_version`: 7.0, 7.1, 7.2
+- `php_version`: 7.3, 7.4... depending OS (see above)
 - `php_install_fpm`: boolean, install and manage php-fpm (default is true)
 - `php_install_xdebug`: boolean, install [Xdebug](http://xdebug.org)
 - `php_extra_packages`: additional php packages to install (default is an empty list).
@@ -57,7 +56,6 @@ Note:
 - Put specific configuration in `php_ini_fpm`/`php_ini_cli`.
 - You can override with `php_ini_fpm`/`php_ini_cli`, but it breaks idempotence.
 
-
 #### OpCache settings
 
 See [Opcache doc](https://secure.php.net/manual/en/opcache.configuration.php)

Vagrantfile

@@ -9,6 +9,10 @@ Vagrant.configure("2") do |config|
     { :name => "debian-stretch-php70", :box => "debian/stretch64", :vars => { }},
     { :name => "debian-stretch-php71", :box => "debian/stretch64", :vars => { "php_version": '7.1' }},
     { :name => "debian-stretch-php72", :box => "debian/stretch64", :vars => { "php_version": '7.2' }},
+    { :name => "debian-stretch-php73", :box => "debian/stretch64", :vars => { "php_version": '7.3' }},
+    { :name => "debian-stretch-php74", :box => "debian/stretch64", :vars => { "php_version": '7.4' }},
+    { :name => "debian-buster-php73",  :box => "debian/buster64",  :vars => { }},
+    { :name => "debian-buster-php74",  :box => "debian/buster64",  :vars => { "php_version": '7.4' }},
     { :name => "ubuntu-xenial-php70",  :box => "ubuntu/xenial64",  :vars => { }},
     { :name => "ubuntu-bionic-php72",  :box => "ubuntu/bionic64",  :vars => { }},
   ]
@@ -22,6 +26,10 @@ Vagrant.configure("2") do |config|
     { :name => "docker-debian-stretch-php70", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { }},
     { :name => "docker-debian-stretch-php71", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { "php_version": '7.1' }},
     { :name => "docker-debian-stretch-php72", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { "php_version": '7.2' }},
+    { :name => "docker-debian-stretch-php73", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { "php_version": '7.3' }},
+    { :name => "docker-debian-stretch-php74", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { "php_version": '7.4' }},
+    { :name => "docker-debian-buster-php73",  :docker => "hanxhx/vagrant-ansible:debian10",    :vars => { }},
+    { :name => "docker-debian-buster-php74",  :docker => "hanxhx/vagrant-ansible:debian10",    :vars => { "php_version": '7.4' }},
     { :name => "docker-ubuntu-xenial-php70",  :docker => "hanxhx/vagrant-ansible:ubuntu16.04", :vars => { }},
     { :name => "docker-ubuntu-bionic-php72",  :docker => "hanxhx/vagrant-ansible:ubuntu18.04", :vars => { }},
   ]
@@ -35,6 +43,7 @@ Vagrant.configure("2") do |config|
         d.remains_running = true
         d.has_ssh = true
       end
+      m.vm.provision "shell", inline: "apt-get update && apt-get install -y python python-apt"
       m.vm.provision "ansible" do |ansible|
         ansible.playbook = "tests/test.yml"
         ansible.verbose = 'vv'
@@ -62,6 +71,7 @@ Vagrant.configure("2") do |config|
   end
 
   vms_freebsd.each do |opts|
+    config.vm.synced_folder ".", "/vagrant", disabled: true
     config.vm.base_mac = "080027D14C66"
     config.vm.define opts[:name] do |m|
       m.vm.box = opts[:box]

defaults/main.yml

@@ -5,6 +5,7 @@ php_install_fpm: true
 php_install_xdebug: false
 php_extra_packages: []
 php_xdebug_package: null
+php_autoremove_default_pool: false
 
 # php.ini config
 php_ini:
@@ -90,10 +91,10 @@ php_xdebug_var_display_max_depth: '3'
 
 # PHP-FPM
 php_fpm_poold:
-  - pool_name: 'www'
+  - name: 'www'
     listen: '{{ php_default_fpm_sock }}'
     pm: 'dynamic'
-    pm_max_children: 250
+    pm_max_children: 100
     pm_start_servers: 10
     pm_min_spare_servers: 10
     pm_max_spare_servers: 20

filter_plugins/php.py

@@ -0,0 +1,10 @@
+def php_socket(php_version, pool_name):
+    return '/run/php/php%s-%s-fpm.sock' % (php_version, pool_name)
+
+class FilterModule(object):
+    ''' PHP module '''
+
+    def filters(self):
+        return {
+            'php_socket': php_socket,
+        }

handlers/main.yml

@@ -5,3 +5,10 @@
     name: '{{ php_fpm_service }}'
     state: restarted
   when: php_install_fpm
+  notify: docker restart php-fpm
+
+- name: docker restart php-fpm
+  command: 'service {{ php_fpm_service }} restart'
+  args:
+    warn: false
+  when: ansible_virtualization_type == 'docker'

meta/main.yml

@@ -1,14 +1,15 @@
 ---
 galaxy_info:
   author: Emilien Mantel
-  description: Install and configure PHP 7.0/7.1/7.2 (+ FPM is wanted)
+  description: Install and configure PHP 7.0/7.1/7.2/7.3
   company:
   license: GPLv2
-  min_ansible_version: 2.0
+  min_ansible_version: 2.6
   platforms:
   - name: Debian
     versions:
     - stretch
+    - buster
   - name: Ubuntu
     versions:
     - xenial

tasks/fpm.yml

@@ -14,16 +14,23 @@
 
 - name: LINEINFILE | PHP configuration
   lineinfile:
-    dest: '{{ php_cli_ini }}'
+    dest: '{{ php_fpm_ini }}'
     regexp: '^;?{{ item.key }}'
     line: '{{ item.key }} = {{ item.value }}'
     create: yes
-  with_dict: "{{ php_ini | combine(php_ini_fpm) }}"
+  loop: "{{ php_ini | combine(php_ini_fpm) | dict2items }}"
   notify: restart php-fpm
 
 - name: TEMPLATE | Deploy pool configuration
   template:
     src: etc/__php__/fpm/pool.d/pool.conf.j2
-    dest: '{{ php_fpm_pool_dir }}/{{ item.pool_name }}.conf'
-  with_items: "{{ php_fpm_poold }}"
+    dest: '{{ php_fpm_pool_dir }}/{{ item.name }}.conf'
+  loop: "{{ ansible_local.hanxhx_php.fpm_pool }}"
+  notify: restart php-fpm
+
+- name: FILE | Delete default pool if necessary
+  file:
+    path: "{{ php_fpm_pool_dir }}/www.conf"
+    state: absent
+  when: '"www" not in (ansible_local.hanxhx_php.fpm_pool | map(attribute="name") | list) and php_autoremove_default_pool'
   notify: restart php-fpm

tasks/main.yml

@@ -4,41 +4,108 @@
   include_vars: "OS_Family_{{ ansible_os_family }}.yml"
 
 - name: INCLUDE_VARS | Related to OS version
-  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
+    - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+
+- name: SET_FACT | Transform data
+  set_fact:
+    __php_fpm_full_pool: |
+      [
+      {% for p in php_fpm_poold %}
+        {
+          name: "{{ p.name | default(p.pool_name) }}",
+          listen: "{{ p.listen | default(php_version | php_socket(p.name | default(p.pool_name))) }}",
+          user: "{{ p.user | default(php_default_user_group) }}",
+          group: "{% if p.user is defined %}{{ p.group | default(p.user) }}{% else %}{{ p.group | default(php_default_user_group) }}{% endif %}",
+          php_value: {% if p.php_value is defined %}{{ p.php_value | to_nice_json }}{% else %}{}{% endif %},
+          php_admin_value: {% if p.php_admin_value is defined %}{{ p.php_admin_value | to_nice_json }}{% else %}{}{% endif %},
+          {% for k, v in p.items() | list %}
+          {% if k not in ['name', 'pool_name', 'listen', 'user', 'group', 'php_value', 'php_admin_value'] %}
+          {{ k }}: "{{ v }}"{% if not loop.last %},{% endif %}
+          {% endif %}
+          {% endfor %}
+        }{% if not loop.last %},{% endif %}
+      {% endfor %}
+      ]
+
+- name: SET_FACT | To YAML
+  set_fact:
+    php_fpm_full_pool: "{{ __php_fpm_full_pool | from_yaml }}"
+
+- name: FILE | Creates ansible facts.d
+  file:
+    path: /etc/ansible/facts.d
+    state: directory
+    recurse: yes
+
+- name: COPY | Manage facts
+  copy:
+    content: "{ \"fpm_pool\": {{ php_fpm_full_pool | to_nice_json }} }"
+    dest: /etc/ansible/facts.d/hanxhx_php.fact
+  register: f
+
+- name: SETUP | Gathers new facts
+  setup:
+  when: f.changed
+  tags:
+    - skip_ansible_lint
 
 - name: APT | Install PHP packages
   apt:
-    pkg: "{{ item }}"
+    pkg: "{{ pkgs }}"
     state: present
     update_cache: yes
     cache_valid_time: 3600
-  with_flattened:
-    - "{{ php_packages }}"
-    - "{{ php_extra_packages }}"
+  vars:
+    pkgs: "{{ php_packages + php_extra_packages | flatten }}"
   notify: restart php-fpm
   when: ansible_os_family == 'Debian'
 
 - name: PKGNG | Install PHP packages
   pkgng:
-    name: "{{ item }}"
-  with_flattened:
-    - "{{ php_packages }}"
-    - "{{ php_extra_packages }}"
+    name: "{{ php_packages + php_extra_packages | flatten | join(',') }}"
   notify: restart php-fpm
   when: ansible_os_family == 'FreeBSD'
 
-- name: INCLUDE | PHP-FPM
-  include: fpm.yml
+- name: IMPORT_TASKS | PHP-FPM
+  import_tasks: fpm.yml
 
 - name: LINEINFILE | PHP CLI configuration
   lineinfile:
     dest: '{{ php_cli_ini }}'
     regexp: '^;?{{ item.key }}'
     line: '{{ item.key }} = {{ item.value }}'
-  with_dict: "{{ php_ini | combine(php_ini_cli) }}"
+  loop: "{{ php_ini | combine(php_ini_cli) | dict2items }}"
 
-- name: INCLUDE | Xdebug
-  include: xdebug.yml
+- name: IMPORT_TASKS | Xdebug
+  import_tasks: xdebug.yml
 
 - name: APT | Install and configure opcache
-  include: opcache.yml
+  import_tasks: opcache.yml
+
+- name: SERVICE | Ensure PHP-FPM is started
+  service:
+    name: '{{ php_fpm_service }}'
+    state: started
+  when: php_install_fpm and ansible_virtualization_type != 'docker'
+
+- block:
+
+  - name: COMMAND | Check if PHP-FPM is started (Docker)
+    command: 'service {{ php_fpm_service }} status'
+    args:
+      warn: false
+    register: dps
+    changed_when: false
+    failed_when: false
+
+  - name: COMMAND | Ensure PHP-FPM is started (Docker)
+    command: 'service {{ php_fpm_service }} start'
+    args:
+      warn: false
+    when: dps.stdout.find('is not running') != -1
+
+  when: php_install_fpm and ansible_virtualization_type == 'docker'

tasks/opcache.yml

@@ -4,7 +4,7 @@
 
   - name: APT | Install APCu
     apt:
-      pkg: "{{ php_package_prefix }}apcu"
+      pkg: "php-apcu"
 
   - name: APT | Install Opcache
     apt:

tasks/xdebug.yml

@@ -33,9 +33,10 @@
       state: absent
     when: ansible_os_family == 'Debian'
 
-  - name: PKGNG | Install xdebug
+  - name: PKGNG | Uninstall xdebug
     pkgng:
       name: "{{ php_xdebug_package }}"
-    when: ansible_os_family == 'FreeBSD' and php_xdebug_package is defined
+      state: absent
+    when: ansible_os_family == 'FreeBSD'
 
   when: not php_install_xdebug

templates/etc/__php__/fpm/pool.d/pool.conf.j2

@@ -1,7 +1,7 @@
-; Start a new pool named '{{ item.pool_name }}'.
+; Start a new pool named '{{ item.name }}'.
 ; the variable $pool can we used in any directive and will be replaced by the
-; pool name ('{{ item.pool_name }}' here)
-[{{ item.pool_name }}]
+; pool name ('{{ item.name }}' here)
+[{{ item.name }}]
 
 ; Per pool prefix
 ; It only applies on the following directives:
@@ -20,8 +20,8 @@
 ; Unix user/group of processes
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
-user = {{ item.user | default(php_default_user_group) }}
-group = {{ item.group | default(php_default_user_group) }}
+user = {{ item.user }}
+group = {{ item.group }}
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:
@@ -95,7 +95,7 @@ listen.group = {{ item.listen_owner | default(php_default_user_group) }}
 ;             pm.process_idle_timeout   - The number of seconds after which
 ;                                         an idle process will be killed.
 ; Note: This value is mandatory.
-pm = {{ item.pm }}
+pm = {{ item.pm | default('dynamic') }}
 
 ; The number of child processes to be created when pm is set to 'static' and the
 ; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
@@ -106,33 +106,33 @@ pm = {{ item.pm }}
 ; forget to tweak pm.* to fit your needs.
 ; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
 ; Note: This value is mandatory.
-pm.max_children = {{ item.pm_max_children }}
+pm.max_children = {{ item.pm_max_children | default('250') }}
 
 ; The number of child processes created on startup.
 ; Note: Used only when pm is set to 'dynamic'
 ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
-pm.start_servers = {{ item.pm_start_servers }}
+pm.start_servers = {{ item.pm_start_servers | default('10') }}
 
 ; The desired minimum number of idle server processes.
 ; Note: Used only when pm is set to 'dynamic'
 ; Note: Mandatory when pm is set to 'dynamic'
-pm.min_spare_servers = {{ item.pm_min_spare_servers }}
+pm.min_spare_servers = {{ item.pm_min_spare_servers | default('10') }}
 
 ; The desired maximum number of idle server processes.
 ; Note: Used only when pm is set to 'dynamic'
 ; Note: Mandatory when pm is set to 'dynamic'
-pm.max_spare_servers = {{ item.pm_max_spare_servers }}
+pm.max_spare_servers = {{ item.pm_max_spare_servers | default('20') }}
 
 ; The number of seconds after which an idle process will be killed.
 ; Note: Used only when pm is set to 'ondemand'
 ; Default Value: 10s
-;pm.process_idle_timeout = 10s;
+pm.process_idle_timeout = {{ item.pm_process_idle_timeout | default('10s') }};
 
 ; The number of requests each child process should execute before respawning.
 ; This can be useful to work around memory leaks in 3rd party libraries. For
 ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
 ; Default Value: 0
-;pm.max_requests = 500
+pm.max_requests = {{ item.pm_max_requests | default('0') }}
 
 ; The URI to view the FPM status page. If this value is not set, no URI will be
 ; recognized as a status page. It shows the following informations:
@@ -369,7 +369,7 @@ chdir = /
 ; Note: on highloaded environement, this can cause some delay in the page
 ; process time (several ms).
 ; Default Value: no
-;catch_workers_output = yes
+catch_workers_output = {{ item.catch_workers_output | default('no') }}
 
 ; Clear environment in FPM workers
 ; Prevents arbitrary environment variables from reaching FPM worker processes
@@ -421,5 +421,10 @@ chdir = /
 ;php_admin_value[error_log] = /var/log/fpm-php.www.log
 ;php_admin_flag[log_errors] = on
 ;php_admin_value[memory_limit] = 32M
-
+{% for k, v in item.php_value.items() | list %}
+php_value[{{ k }}] = {{ v }}
+{% endfor %}
+{% for k, v in item.php_admin_value.items() | list %}
+php_admin_value[{{ k }}] = {{ v }}
+{% endfor %}
 ; vim:filetype=dosini

tests/includes/Debian/dotdeb.yml

@@ -1,9 +0,0 @@
----
-
-- name: APT | Install DotDeb key
-  apt_key:
-    url: 'http://www.dotdeb.org/dotdeb.gpg'
-
-- name: APT | Add Dotdeb repository
-  apt_repository:
-    repo: 'deb http://packages.dotdeb.org {{ ansible_distribution_release }} all'

tests/includes/Debian/sury.yml

@@ -4,6 +4,6 @@
   apt_key:
     url: 'https://packages.sury.org/php/apt.gpg'
 
-- name: APT | Add Sury repository
+- name: APT_REPOSITORY | Add Sury repository
   apt_repository:
     repo: 'deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main'

tests/includes/pre_Debian.yml

@@ -6,18 +6,20 @@
 
 - name: APT | Install packages
   apt:
-    pkg: "{{ item }}"
+    pkg: "{{ p }}"
     update_cache: yes
     cache_valid_time: 3600
-  with_items:
-    - apt-transport-https
-    - ca-certificates
-    - curl
-    - lsb-release
-    - nginx
+  vars:
+    p:
+      - apt-transport-https
+      - ca-certificates
+      - curl
+      - lsb-release
+      - nginx
+      - vim
 
-- name: INCLUDE | Sury
-  include: Debian/sury.yml
-  when: >
-    ansible_distribution_major_version | version_compare(9, 'eq') and
-    php_version | version_compare('7.1', 'ge')
+- name: INCLUDE_TASKS | Sury
+  include_tasks: Debian/sury.yml
+  when:
+    ((ansible_distribution_major_version is version('9', 'eq')) and (php_version is version('7.1', 'ge'))) or
+    ((ansible_distribution_major_version is version('10', 'eq')) and (php_version is version('7.4', 'ge')))

tests/includes/pre_FreeBSD.yml

@@ -3,11 +3,8 @@
 - name: SET_FACT | Prepare test vars
   set_fact:
     __nginx_conf: /usr/local/etc/nginx/nginx.conf
-    php_xdebug_package: 'php72-pecl-xdebug26'
+    php_xdebug_package: 'php72-pecl-xdebug-2.6.1'
 
 - name: PKGNG | Install packages
   pkgng:
-    name: "{{ item }}"
-  with_items:
-    - curl
-    - nginx
+    name: ['curl', 'nginx']

tests/templates/nginx.conf.j2

@@ -15,22 +15,27 @@ http {
 
 		root /var/www;
 
-{% if php_fpm_poold.0.status_path is defined %}
-		location = {{ php_fpm_poold.0.status_path }} {
+{% if ansible_local.hanxhx_php.fpm_pool.0.status_path is defined %}
+		location = {{ ansible_local.hanxhx_php.fpm_pool.0.status_path }} {
 			include fastcgi.conf;
-			fastcgi_pass unix:{{ php_default_fpm_sock }};
+			fastcgi_pass unix:{{ ansible_local.hanxhx_php.fpm_pool.0.listen }};
 		}
 {% endif %}
-{% if php_fpm_poold.0.ping_path is defined %}
-		location = {{ php_fpm_poold.0.ping_path }} {
+{% if ansible_local.hanxhx_php.fpm_pool.0.ping_path is defined %}
+		location = {{ ansible_local.hanxhx_php.fpm_pool.0.ping_path }} {
 			include fastcgi.conf;
-			fastcgi_pass unix:{{ php_default_fpm_sock }};
+			fastcgi_pass unix:{{ ansible_local.hanxhx_php.fpm_pool.0.listen }};
 		}
 {% endif %}
 
+		location = /ini.php {
+			include fastcgi.conf;
+			fastcgi_pass unix:{{ ansible_local.hanxhx_php.fpm_pool.1.listen }};
+		}
+
 		location ~ \.php$ {
 			include fastcgi.conf;
-			fastcgi_pass unix:{{ php_default_fpm_sock }};
+			fastcgi_pass unix:{{ ansible_local.hanxhx_php.fpm_pool.0.listen }};
 		}
 	}
 }

tests/test.yml

@@ -4,15 +4,16 @@
   vars:
     vhost: 'test.local'
     php_extra_packages:
-      - '{{ php_package_prefix }}recode'
+      - '{{ php_package_prefix }}pgsql'
     php_install_xdebug: true
+    php_autoremove_default_pool: true
     php_ini_fpm:
       display_errors: 'Off'
     php_ini_cli:
       error_reporting: 'E_ALL'
     php_fpm_poold:
-      - pool_name: 'www'
-        listen: '{{ php_default_fpm_sock }}'
+      - pool_name: 'test_ansible'
+        listen: '/run/php/php-ansible1.sock'
         pm: 'dynamic'
         pm_max_children: 250
         pm_start_servers: 10
@@ -21,11 +22,24 @@
         status_path: '/status'
         ping_path: '/ping'
         ping_response: 'ok'
+      - name: 'test_ansible2'
+        user: 'foo'
+        php_value:
+          display_errors: 'Off'
+        php_admin_value:
+          memory_limit: '98M'
 
   pre_tasks:
 
-    - name: INCLUDE | Pre tasks related to OS
-      include: "includes/pre_{{ ansible_os_family }}.yml"
+    - name: INCLUDE_TASKS | Pre tasks related to OS
+      include_tasks: "includes/pre_{{ ansible_os_family }}.yml"
+
+    - name: USER | Create PHP user
+      user:
+        name: 'foo'
+        system: yes
+        create_home: no
+        shell: '/usr/sbin/nologin'
 
   tasks:
 
@@ -48,12 +62,44 @@
         dest: "{{ __nginx_conf | dirname }}/fastcgi.conf"
       notify: reload nginx
 
+    - name: SERVICE | Ensure nginx is started
+      service:
+        name: nginx
+        state: started
+      when: ansible_virtualization_type != 'docker'
+
+    - block:
+
+      - name: COMMAND | Docker nginx status
+        command: service nginx status
+        args:
+          warn: false
+        changed_when: false
+        failed_when: false
+        register: ngs
+
+      - name: COMMAND | Docker start nginx
+        command: service nginx start
+        args:
+          warn: false
+        when: ngs.stdout.find('nginx is not running') != -1
+
+      when: ansible_virtualization_type == 'docker'
+
   handlers:
 
     - name: reload nginx
       service:
         name: nginx
         state: reloaded
+      notify: docker reload nginx
+
+    - name: docker reload nginx
+      command: service nginx reload
+      args:
+        warn: false
+      notify: docker reload nginx
+      when: ansible_virtualization_type == 'docker'
 
   roles:
     - ../../
@@ -76,6 +122,11 @@
         dest: /var/www/phpinfo.php
         content: '<?php phpinfo();'
 
+    - name: COPY | Add ini test file
+      copy:
+        dest: /var/www/ini.php
+        content: '<?php echo ini_get("memory_limit") . "\n";'
+
     - name: SHELL | Check vhost
       shell: "curl -v -H 'Host: {{ vhost }}' http://127.0.0.1/phpinfo.php 2> /dev/null | grep h1 | grep -o 'PHP Version {{ php_version }}' | sed -r 's/<//g'"
       args:
@@ -84,6 +135,14 @@
       register: c
       failed_when: c.stdout == ''
 
+    - name: SHELL | Check custom php value
+      shell: "curl -H 'Host: {{ vhost }}' http://127.0.0.1/ini.php 2> /dev/null"
+      args:
+        warn: false
+      changed_when: false
+      register: c
+      failed_when: 'php_fpm_poold.1.php_admin_value.memory_limit not in c.stdout'
+
     - name: URI | Check ping
       uri:
         url: "http://localhost{{ php_fpm_poold.0.ping_path }}"

vars/Debian-buster.yml

@@ -0,0 +1 @@
+php_default_version: '7.3'

vars/FreeBSD-12.yml

@@ -0,0 +1 @@
+php_default_version: '7.2'