Merge branch 'master' into freebsd

.gitignore

@@ -1,3 +1,4 @@
 .vagrant*
 *.swp
 *.retry
+*.log

.travis.yml

@@ -1,24 +1,20 @@
 env:
-  - PLATFORM='docker-debian-jessie-php56'  ANSIBLE_VERSION='ansible>=2.0,<2.1'
-  - PLATFORM='docker-debian-jessie-php70'  ANSIBLE_VERSION='ansible>=2.0,<2.1'
-  - PLATFORM='docker-debian-jessie-php71'  ANSIBLE_VERSION='ansible>=2.0,<2.1'
   - 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-jessie-php56'  ANSIBLE_VERSION='ansible>=2.1,<2.2'
-  - PLATFORM='docker-debian-jessie-php70'  ANSIBLE_VERSION='ansible>=2.1,<2.2'
-  - PLATFORM='docker-debian-jessie-php71'  ANSIBLE_VERSION='ansible>=2.1,<2.2'
   - 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-jessie-php56'  ANSIBLE_VERSION='ansible>=2.2,<2.3'
-  - PLATFORM='docker-debian-jessie-php70'  ANSIBLE_VERSION='ansible>=2.2,<2.3'
-  - PLATFORM='docker-debian-jessie-php71'  ANSIBLE_VERSION='ansible>=2.2,<2.3'
   - 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-jessie-php56'  ANSIBLE_VERSION='ansible>=2.3,<2.4'
-  - PLATFORM='docker-debian-jessie-php70'  ANSIBLE_VERSION='ansible>=2.3,<2.4'
-  - PLATFORM='docker-debian-jessie-php71'  ANSIBLE_VERSION='ansible>=2.3,<2.4'
   - 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'
 
 sudo: required
 

README.md

@@ -1,17 +1,20 @@
-Ansible PHP (+FPM) role for Debian
+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. Manage APCu, Opcache, Xdebug.
+Install PHP (php-fpm optional) on Debian / Ubuntu. Manage APCu, Opcache, Xdebug.
 
 Managed OS / Versions
 ---------------------
 
-|       OS      |  PHP 5.6  |          PHP 7.0          |        PHP 7.1        |    PHP 7.2   |
+|         OS            |   PHP 7.0    |    PHP 7.1    |    PHP 7.2   |
-|:-------------:|:---------:|:-------------------------:|:---------------------:|:------------:|
+|:---------------------:|:------------:|:-------------:|:------------:|
-| Debian Jessie | Yes       | Yes (from Dotdeb or Sury) | Yes (Dotdeb or Sury)  | Yes (Sury)   |
+| Debian Strech (9)     | Yes          | Yes (Sury)    | Yes (Sury)   |
-| Debian Strech | No        | 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          |
 
 Links:
 - [Dotdeb](https://www.dotdeb.org)
@@ -22,6 +25,14 @@ 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)
+- You must explicitely set xdebug package name (use `pkg search xdebug` to find the good one)
+
 Role Variables
 --------------
 
@@ -29,7 +40,7 @@ You should look at [default vars](defaults/main.yml).
 
 ### Writable vars
 
-- `php_version`: 5.6 (default), 7.0, 7.1
+- `php_version`: 7.0, 7.1, 7.2
 - `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).
@@ -151,12 +162,12 @@ Example Playbook
       roles:
          - { role: HanXHX.php }
 
-### Debian Jessie with PHP 7.0 CLI (no FPM)
+### Debian Stretch with PHP 7.2 CLI (no FPM)
 
-    - hosts: jessie-servers
+    - hosts: servers
       roles:
-         - { role: HanXHX.dotdeb }
+         - { role: HanXHX.sury }
-         - { role: HanXHX.php, php_version: '7.0', php_install_fpm: false }
+         - { role: HanXHX.php, php_version: '7.2', php_install_fpm: false }
 
 License
 -------
@@ -169,7 +180,7 @@ Donation
 If this code helped you, or if you’ve used them for your projects, feel free to buy me some :beers:
 
 - Bitcoin: `1BQwhBeszzWbUTyK4aUyq3SRg7rBSHcEQn`
-- Ethereum: `63abe6b2648fd892816d87a31e3d9d4365a737b5`
+- Ethereum: `0x63abe6b2648fd892816d87a31e3d9d4365a737b5`
 - Litecoin: `LeNDw34zQLX84VvhCGADNvHMEgb5QyFXyD`
 - Monero: `45wbf7VdQAZS5EWUrPhen7Wo4hy7Pa7c7ZBdaWQSRowtd3CZ5vpVw5nTPphTuqVQrnYZC72FXDYyfP31uJmfSQ6qRXFy3bQ`
 
@@ -179,4 +190,3 @@ Author Information
 ------------------
 
 - Twitter: [@hanxhx_](https://twitter.com/hanxhx_)
-- All issues, pull-requests are welcome :)

Vagrantfile

@@ -6,19 +6,24 @@
 Vagrant.configure("2") do |config|
 
   vms_debian = [
-    { :name => "debian-jessie-php56",  :box => "debian/jessie64",  :vars => { }},
-    { :name => "debian-jessie-php70",  :box => "debian/jessie64",  :vars => { "php_version": '7.0' }},
-    { :name => "debian-jessie-php71",  :box => "debian/jessie64",  :vars => { "php_version": '7.1' }},
     { :name => "debian-stretch-php70", :box => "debian/stretch64", :vars => { }},
-    { :name => "debian-stretch-php71", :box => "debian/stretch64", :vars => { "php_version": '7.1' }}
+    { :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 => "ubuntu-xenial-php70",  :box => "ubuntu/xenial64",  :vars => { }},
+    { :name => "ubuntu-bionic-php72",  :box => "ubuntu/bionic64",  :vars => { }},
+  ]
+
+  vms_freebsd = [
+    { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.1-STABLE",  :vars => {} },
+    { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.0-CURRENT", :vars => {} }
   ]
 
   conts = [
-    { :name => "docker-debian-jessie-php56",  :docker => "hanxhx/vagrant-ansible:debian8", :vars => { }},
+    { :name => "docker-debian-stretch-php70", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { }},
-    { :name => "docker-debian-jessie-php70",  :docker => "hanxhx/vagrant-ansible:debian8", :vars => { "php_version": '7.0' }},
+    { :name => "docker-debian-stretch-php71", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { "php_version": '7.1' }},
-    { :name => "docker-debian-jessie-php71",  :docker => "hanxhx/vagrant-ansible:debian8", :vars => { "php_version": '7.1' }},
+    { :name => "docker-debian-stretch-php72", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { "php_version": '7.2' }},
-    { :name => "docker-debian-stretch-php70", :docker => "hanxhx/vagrant-ansible:debian9", :vars => { }},
+    { :name => "docker-ubuntu-xenial-php70",  :docker => "hanxhx/vagrant-ansible:ubuntu16.04", :vars => { }},
-    { :name => "docker-debian-stretch-php71", :docker => "hanxhx/vagrant-ansible:debian9", :vars => { "php_version": '7.1' }}
+    { :name => "docker-ubuntu-bionic-php72",  :docker => "hanxhx/vagrant-ansible:ubuntu18.04", :vars => { }},
   ]
 
   config.vm.network "private_network", type: "dhcp"
@@ -46,12 +51,33 @@ Vagrant.configure("2") do |config|
         v.cpus = 1
         v.memory = 256
       end
-       m.vm.provision "ansible" do |ansible|
+      m.vm.provision "shell", inline: "apt-get update && apt-get install -y ifupdown python"
-         ansible.playbook = "tests/test.yml"
+      m.vm.provision "ansible" do |ansible|
-         ansible.verbose = 'vv'
+        ansible.playbook = "tests/test.yml"
-         ansible.become = true
+        ansible.verbose = 'vv'
-          ansible.extra_vars = opts[:vars]
+        ansible.become = true
-       end
+        ansible.extra_vars = opts[:vars]
+      end
     end
   end
+
+  vms_freebsd.each do |opts|
+    config.vm.base_mac = "080027D14C66"
+    config.vm.define opts[:name] do |m|
+      m.vm.box = opts[:box]
+      m.vm.provider "virtualbox" do |v, override|
+        override.ssh.shell = "csh"
+        v.cpus = 2
+        v.memory = 512
+      end
+      m.vm.provision "shell", inline: "pkg install -y python bash"
+      m.vm.provision "ansible" do |ansible|
+        ansible.playbook = "tests/test.yml"
+        ansible.verbose = 'vv'
+        ansible.become = true
+        ansible.extra_vars = opts[:vars].merge({ "ansible_python_interpreter": '/usr/local/bin/python' })
+      end
+    end
+  end
+
 end

defaults/main.yml

@@ -4,6 +4,7 @@ php_version: '{{ php_default_version }}'
 php_install_fpm: true
 php_install_xdebug: false
 php_extra_packages: []
+php_xdebug_package: null
 
 # php.ini config
 php_ini:

handlers/main.yml

@@ -1,5 +1,7 @@
 ---
 
 - name: restart php-fpm
-  service: name='{{ php_fpm_service }}' state=restarted
+  service:
+    name: '{{ php_fpm_service }}'
+    state: restarted
   when: php_install_fpm

meta/main.yml

@@ -1,21 +1,31 @@
 ---
 galaxy_info:
   author: Emilien Mantel
-  description: Install and configure PHP 5.6/7.0/7.1 (+ FPM is wanted)
+  description: Install and configure PHP 7.0/7.1/7.2 (+ FPM is wanted)
   company:
   license: GPLv2
   min_ansible_version: 2.0
   platforms:
   - name: Debian
     versions:
-    - jessie
+    - stretch
+  - name: Ubuntu
+    versions:
+    - xenial
+    - bionic
+  - name: FreeBSD
+    versions:
+    - 11.0
+    - 11.1
+    - 12.0
   galaxy_tags:
   - development
   - web
   - php
-  - php5.6
+  - php-fpm
-  - php5
   - php7
   - debian
+  - ubuntu
+  - freebsd
 dependencies: []
 

tasks/fpm.yml

@@ -1,19 +1,29 @@
 ---
 
-- name: APT | Install PHP-FPM
+- name: APT | Install PHP-FPM for Debian based systems
-  apt: pkg={{ php_fpm_service }} state=present
+  apt:
+    pkg: "{{ php_fpm_service }}"
+    state: "{{ 'present' if php_install_fpm else 'absent' }}"
+  when: ansible_os_family == 'Debian'
+
+- name: SERVICE | Enable service on FreeBSD
+  service:
+    name: "{{ php_fpm_service }}"
+    enabled: "{{ 'yes' if php_install_fpm else 'no' }}"
+  when: ansible_os_family == 'FreeBSD'
 
 - name: LINEINFILE | PHP configuration
   lineinfile:
-    dest: '{{ php_etc_dir }}/fpm/php.ini'
+    dest: '{{ php_cli_ini }}'
     regexp: '^;?{{ item.key }}'
     line: '{{ item.key }} = {{ item.value }}'
+    create: yes
   with_dict: "{{ php_ini | combine(php_ini_fpm) }}"
   notify: restart php-fpm
 
 - name: TEMPLATE | Deploy pool configuration
-  template: >
+  template:
-    src=etc/__php__/fpm/pool.d/pool.conf.j2
+    src: etc/__php__/fpm/pool.d/pool.conf.j2
-    dest='{{ php_etc_dir }}/fpm/pool.d/{{ item.pool_name }}.conf'
+    dest: '{{ php_fpm_pool_dir }}/{{ item.pool_name }}.conf'
   with_items: "{{ php_fpm_poold }}"
   notify: restart php-fpm

tasks/main.yml

@@ -1,36 +1,41 @@
 ---
 
-- name: INCLUDE_VARS | Related to OS
+- name: INCLUDE_VARS | Related to OS family
-  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+  include_vars: "OS_Family_{{ ansible_os_family }}.yml"
 
-- name: ASSERT | Check variables
+- name: INCLUDE_VARS | Related to OS version
-  assert:
+  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
-    that: "php_version in php_managed_versions"
-
-- name: INCLUDE_VARS | Related to PHP version
-  include_vars: "php-{{ php_version }}.yml"
-
-- name: APT | Update cache
-  apt: update_cache=yes cache_valid_time=3600
-  changed_when: false
 
 - name: APT | Install PHP packages
-  apt: pkg={{ item }} state=present
+  apt:
+    pkg: "{{ item }}"
+    state: present
+    update_cache: yes
+    cache_valid_time: 3600
   with_flattened:
     - "{{ php_packages }}"
     - "{{ php_extra_packages }}"
   notify: restart php-fpm
+  when: ansible_os_family == 'Debian'
+
+- name: PKGNG | Install PHP packages
+  pkgng:
+    name: "{{ item }}"
+  with_flattened:
+    - "{{ php_packages }}"
+    - "{{ php_extra_packages }}"
+  notify: restart php-fpm
+  when: ansible_os_family == 'FreeBSD'
 
 - name: INCLUDE | PHP-FPM
   include: fpm.yml
-  when: php_install_fpm
 
-- name: LINEINFILE | PHP configuration
+- name: LINEINFILE | PHP CLI configuration
   lineinfile:
-    dest: '{{ php_etc_dir }}/cli/php.ini'
+    dest: '{{ php_cli_ini }}'
     regexp: '^;?{{ item.key }}'
     line: '{{ item.key }} = {{ item.value }}'
-  with_dict: "{{ php_ini_cli }}"
+  with_dict: "{{ php_ini | combine(php_ini_cli) }}"
 
 - name: INCLUDE | Xdebug
   include: xdebug.yml

tasks/opcache.yml

@@ -1,20 +1,37 @@
 ---
 
-- name: APT | Install APCu
+- block:
-  apt: pkg="{{ php_apt_prefix }}apcu" state=present
 
-- name: APT | Install Opcache
+  - name: APT | Install APCu
-  apt: pkg="{{ php_apt_prefix }}opcache" state=present
+    apt:
-  when: php_version | version_compare('7.0', 'ge')
+      pkg: "{{ php_package_prefix }}apcu"
 
-- name: TEMPLATE | Configure APCu
+  - name: APT | Install Opcache
-  template: >
+    apt:
-    src=etc/__php__/mods-available/opcache.ini.j2
+      pkg: "{{ php_package_prefix }}opcache"
-    dest="{{ php_mods_dir }}/opcache.ini"
+
+  when: ansible_os_family == 'Debian'
+
+- block:
+
+  - name: PKGNG | Install APCu
+    pkgng:
+      name: "php{{ php_version | replace('.', '') }}-pecl-APCu"
+
+  - name: PKGNG | Install Opcache
+    pkgng:
+      name: "{{ php_package_prefix }}opcache"
+
+  when: ansible_os_family == 'FreeBSD'
+
+- name: TEMPLATE | Configure Opcache
+  template:
+    src: "etc/__php__/mods-available/opcache.ini.j2"
+    dest: "{{ php_mods_dir }}/opcache.ini"
   notify: restart php-fpm
 
 - name: TEMPLATE | Configure APCu
-  template: >
+  template:
-    src=etc/__php__/mods-available/apcu.ini.j2
+    src: "etc/__php__/mods-available/apcu.ini.j2"
-    dest={{ php_mods_dir }}/apcu.ini
+    dest: "{{ php_mods_dir }}/apcu.ini"
   notify: restart php-fpm

tasks/xdebug.yml

@@ -2,17 +2,18 @@
 
 - block:
 
-  - name: APT | Install php-xdebug
+  - name: APT | Install xdebug
     apt:
-      pkg: "{{ php_apt_prefix }}xdebug"
+      pkg: "{{ php_xdebug_package }}"
       state: present
       update_cache: yes
       cache_valid_time: 3600
+    when: ansible_os_family == 'Debian'
 
-  - name: SHELL | Get Xdebug version
+  - name: PKGNG | Install xdebug
-    shell: dpkg -l | awk '$2 ~ /xdebug$/ { print $3 }'
+    pkgng:
-    changed_when: false
+      name: "{{ php_xdebug_package }}"
-    register: xdebug_version
+    when: ansible_os_family == 'FreeBSD' and php_xdebug_package is defined
 
   - name: TEMPLATE | Deploy module configurations
     template:
@@ -26,13 +27,15 @@
 
 - block:
 
-# We can't uninstall as simple way. We can uninstall with php7.0-xdebug (virtual package), but removing virtual package doesn't affect real package.
+  - name: APT | Uninstall xdebug
-# On Jessie: php5-xdebug, php-xdebug (sury for PHP 5.6/7.0/7.1/7.2), php5-xdebug + php7.0-xdebug (dotdeb)
+    apt:
-# On Stretch: php-xdebug
+      pkg: "{{ php_xdebug_package }}"
+      state: absent
+    when: ansible_os_family == 'Debian'
 
-  - name: COMMAND | Disable xdebug package
+  - name: PKGNG | Install xdebug
-    command: phpdismod -v {{ php_version }} xdebug
+    pkgng:
-    args:
+      name: "{{ php_xdebug_package }}"
-      removes: "{{ php_etc_dir }}/cli/conf.d/20-xdebug.ini"
+    when: ansible_os_family == 'FreeBSD' and php_xdebug_package is defined
 
   when: not php_install_xdebug

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

@@ -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('www-data') }}
+user = {{ item.user | default(php_default_user_group) }}
-group = {{ item.group | default('www-data') }}
+group = {{ item.group | default(php_default_user_group) }}
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:
@@ -46,8 +46,8 @@ listen = {{ item.listen }}
 ; BSD-derived systems allow connections regardless of permissions.
 ; Default Values: user and group are set as the running user
 ;                 mode is set to 0660
-listen.owner = {{ item.listen_owner | default('www-data') }}
+listen.owner = {{ item.listen_owner | default(php_default_user_group) }}
-listen.group = {{ item.listen_owner | default('www-data') }}
+listen.group = {{ item.listen_owner | default(php_default_user_group) }}
 ;listen.mode = 0660
 ; When POSIX Access Control Lists are supported you can set them using
 ; these options, value is a comma separated list of user/group names.

templates/etc/__php__/mods-available/xdebug.ini.j2

@@ -2,9 +2,6 @@
 ; priority=20
 zend_extension=xdebug.so
 
-{% if xdebug_version.stdout|version_compare('2.3', 'gt') %}
-{% endif %}
-
 xdebug_auto_trace={{ php_xdebug_auto_trace }}
 xdebug_cli_color={{ php_xdebug_cli_color }}
 xdebug_collect_assignments={{ php_xdebug_collect_assignments }}
@@ -29,9 +26,7 @@ xdebug_overload_var_dump={{ php_xdebug_overload_var_dump }}
 xdebug_profiler_append={{ php_xdebug_profiler_append }}
 xdebug_profiler_enable={{ php_xdebug_profiler_enable }}
 xdebug_profiler_enable_trigger={{ php_xdebug_profiler_enable_trigger }}
-{% if xdebug_version.stdout|version_compare('2.3', 'gt') %}
 xdebug_profiler_enable_trigger_value={{ php_xdebug_profiler_enable_trigger_value }}
-{% endif %}
 xdebug_profiler_output_dir={{ php_xdebug_profiler_output_dir }}
 xdebug_profiler_output_name={{ php_xdebug_profiler_output_name }}
 xdebug_remote_autostart={{ php_xdebug_remote_autostart }}
@@ -48,9 +43,7 @@ xdebug_show_exception_trace={{ php_xdebug_show_exception_trace }}
 xdebug_show_local_vars={{ php_xdebug_show_local_vars }}
 xdebug_show_mem_delta={{ php_xdebug_show_mem_delta }}
 xdebug_trace_enable_trigger={{ php_xdebug_trace_enable_trigger }}
-{% if xdebug_version.stdout|version_compare('2.3', 'gt') %}
 xdebug_trace_enable_trigger_value={{ php_xdebug_trace_enable_trigger_value }}
-{% endif %}
 xdebug_trace_format={{ php_xdebug_trace_format }}
 xdebug_trace_options={{ php_xdebug_trace_options }}
 xdebug_trace_output_dir={{ php_xdebug_trace_output_dir }}

tests/includes/Debian/dotdeb.yml

@@ -0,0 +1,9 @@
+---
+
+- 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

@@ -0,0 +1,9 @@
+---
+
+- name: APT | Install Sury key
+  apt_key:
+    url: 'https://packages.sury.org/php/apt.gpg'
+
+- name: APT | Add Sury repository
+  apt_repository:
+    repo: 'deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main'

tests/includes/dotdeb.yml

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

tests/includes/pre_Debian.yml

@@ -0,0 +1,23 @@
+---
+
+- name: SET_FACT | Prepare test vars
+  set_fact:
+    __nginx_conf: /etc/nginx/nginx.conf
+
+- name: APT | Install packages
+  apt:
+    pkg: "{{ item }}"
+    update_cache: yes
+    cache_valid_time: 3600
+  with_items:
+    - apt-transport-https
+    - ca-certificates
+    - curl
+    - lsb-release
+    - nginx
+
+- name: INCLUDE | Sury
+  include: Debian/sury.yml
+  when: >
+    ansible_distribution_major_version | version_compare(9, 'eq') and
+    php_version | version_compare('7.1', 'ge')

tests/includes/pre_FreeBSD.yml

@@ -0,0 +1,13 @@
+---
+
+- name: SET_FACT | Prepare test vars
+  set_fact:
+    __nginx_conf: /usr/local/etc/nginx/nginx.conf
+    php_xdebug_package: 'php72-pecl-xdebug26'
+
+- name: PKGNG | Install packages
+  pkgng:
+    name: "{{ item }}"
+  with_items:
+    - curl
+    - nginx

tests/includes/sury.yml

@@ -1,7 +0,0 @@
----
-
-- name: APT | Install Sury key
-  apt_key: url='https://packages.sury.org/php/apt.gpg' state=present
-
-- name: APT | Add Sury repository
-  apt_repository: repo='deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main' state=present

tests/templates/nginx.conf.j2

@@ -0,0 +1,36 @@
+events {
+    worker_connections  1024;
+}
+
+user {{ php_default_user_group }};
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+	server {
+		server_name {{ vhost }};
+
+		root /var/www;
+
+{% if php_fpm_poold.0.status_path is defined %}
+		location = {{ php_fpm_poold.0.status_path }} {
+			include fastcgi.conf;
+			fastcgi_pass unix:{{ php_default_fpm_sock }};
+		}
+{% endif %}
+{% if php_fpm_poold.0.ping_path is defined %}
+		location = {{ php_fpm_poold.0.ping_path }} {
+			include fastcgi.conf;
+			fastcgi_pass unix:{{ php_default_fpm_sock }};
+		}
+{% endif %}
+
+		location ~ \.php$ {
+			include fastcgi.conf;
+			fastcgi_pass unix:{{ php_default_fpm_sock }};
+		}
+	}
+}

tests/templates/site.j2

@@ -1,23 +0,0 @@
-server {
-	server_name {{ vhost }};
-
-	root /var/www;
-
-{% if php_fpm_poold.0.status_path is defined %}
-	location = {{ php_fpm_poold.0.status_path }} {
-		include {{ nginx_include }};
-		fastcgi_pass unix:{{ php_default_fpm_sock }};
-	}
-{% endif %}
-{% if php_fpm_poold.0.ping_path is defined %}
-	location = {{ php_fpm_poold.0.ping_path }} {
-		include {{ nginx_include }};
-		fastcgi_pass unix:{{ php_default_fpm_sock }};
-	}
-{% endif %}
-
-	location ~ \.php$ {
-		include {{ nginx_include }};
-		fastcgi_pass unix:{{ php_default_fpm_sock }};
-	}
-}

tests/test.yml

@@ -4,7 +4,7 @@
   vars:
     vhost: 'test.local'
     php_extra_packages:
-      - '{{ php_apt_prefix }}recode'
+      - '{{ php_package_prefix }}recode'
     php_install_xdebug: true
     php_ini_fpm:
       display_errors: 'Off'
@@ -24,54 +24,36 @@
 
   pre_tasks:
 
-    - name: APT | Install packages
+    - name: INCLUDE | Pre tasks related to OS
-      apt: pkg={{ item }} update_cache=yes cache_valid_time=3600
+      include: "includes/pre_{{ ansible_os_family }}.yml"
-      with_items: ['apt-transport-https', 'curl', 'lsb-release', 'ca-certificates']
-
-    - name: INCLUDE | Dotdeb
-      include: includes/dotdeb.yml
-      when: >
-        ansible_distribution_major_version | version_compare(8, 'eq') and
-        php_version | version_compare('7.0', 'eq')
-
-    - name: INCLUDE | Sury
-      include: includes/sury.yml
-      when: >
-        ansible_distribution_major_version | version_compare(9, 'le') and
-        php_version | version_compare('7.1', 'eq')
-
-    - name: APT | Install nginx
-      apt: pkg=nginx state=present update_cache=yes cache_valid_time=3600
-
-    - name: SHELL | Get nginx version
-      shell: nginx -V 2>&1 | awk -F '/' '/nginx version/ { print $2 }'
-      register: nginx_version
-      changed_when: false
-
-    - set_fact: nginx_include="fastcgi_params"
-      when: nginx_version.stdout | version_compare('1.6', '<', true)
-
-    - set_fact: nginx_include="fastcgi.conf"
-      when: nginx_version.stdout | version_compare('1.6', '>=', true)
 
   tasks:
 
     - name: TEMPLATE | Nginx site config
       template:
-        src: templates/site.j2
+        src: "templates/nginx.conf.j2"
-        dest: /etc/nginx/sites-enabled/{{ vhost }}
+        dest: "{{ __nginx_conf  }}"
       notify: reload nginx
 
-    - name: FILE | Delete default site
+    - name: COMMAND | Fix nginx config
-      file:
+      command: "cp {{ __nginx_conf | dirname }}/fastcgi_params {{ __nginx_conf | dirname }}/fastcgi.conf"
-        path: /etc/nginx/sites-enabled/default
+      args:
-        state: absent
+        creates: "{{ __nginx_conf | dirname }}/fastcgi.conf"
+      notify: reload nginx
+
+    - name: LINEINFILE | Fix nginx config (second step)
+      lineinfile:
+        regexp: '^fastcgi_param\s+SCRIPT_FILENAME'
+        line: "fastcgi_param  SCRIPT_FILENAME    $realpath_root$fastcgi_script_name;"
+        dest: "{{ __nginx_conf | dirname }}/fastcgi.conf"
       notify: reload nginx
 
   handlers:
 
     - name: reload nginx
-      service: name=nginx state=reloaded
+      service:
+        name: nginx
+        state: reloaded
 
   roles:
     - ../../
@@ -85,10 +67,14 @@
       failed_when: p.stdout == ''
 
     - name: FILE | Create /var/www
-      file: dest=/var/www state=directory
+      file:
+        dest: /var/www
+        state: directory
 
     - name: COPY | Add phpinfo
-      copy: dest=/var/www/phpinfo.php content='<?php phpinfo();'
+      copy:
+        dest: /var/www/phpinfo.php
+        content: '<?php phpinfo();'
 
     - 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'"

vars/Debian-8.yml

@@ -1,6 +0,0 @@
-php_default_version: '5.6'
-php_managed_versions:
-  - '5.6'
-  - '7.0'
-  - '7.1'
-  - '7.2'

vars/Debian-9.yml

@@ -1,5 +0,0 @@
-php_default_version: '7.0'
-php_managed_versions:
-  - '7.0'
-  - '7.1'
-  - '7.2'

vars/Debian-stretch.yml

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

vars/FreeBSD-12.0-CURRENT.yml

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

vars/OS_Family_Debian.yml

@@ -0,0 +1,23 @@
+---
+
+php_packages:
+  - '{{ php_package_prefix }}cli'
+  - '{{ php_package_prefix }}curl'
+  - '{{ php_package_prefix }}gd'
+  - '{{ php_package_prefix }}mysql'
+  - '{{ php_package_prefix }}intl'
+
+php_xdebug_package: 'php-xdebug'
+
+php_package_prefix: 'php{{ php_version }}-'
+
+php_mods_dir: '/etc/php/{{ php_version }}/mods-available'
+php_fpm_pool_dir: '/etc/php/{{ php_version }}/fpm/pool.d'
+
+php_fpm_service: 'php{{ php_version }}-fpm'
+php_default_fpm_sock: '/var/run/php/php{{ php_version }}-fpm.sock'
+
+php_cli_ini: '/etc/php/{{ php_version }}/cli/php.ini'
+php_fpm_ini: '/etc/php/{{ php_version }}/fpm/php.ini'
+
+php_default_user_group: 'www-data'

vars/OS_Family_FreeBSD.yml

@@ -0,0 +1,20 @@
+---
+
+php_packages:
+  - '{{ php_package_prefix }}curl'
+  - '{{ php_package_prefix }}gd'
+  - '{{ php_package_prefix }}mysqli'
+  - '{{ php_package_prefix }}intl'
+
+php_package_prefix: 'php{{ php_version | replace(".", "") }}-'
+
+php_mods_dir: '/usr/local/etc/php'
+php_fpm_pool_dir: '/usr/local/etc/php-fpm.d'
+
+php_fpm_service: 'php-fpm'
+php_default_fpm_sock: '/var/run/php-fpm.sock'
+
+php_cli_ini: '/usr/local/etc/php.ini'
+php_fpm_ini: '/usr/local/etc/php.ini'
+
+php_default_user_group: 'www'

vars/Ubuntu-bionic.yml

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

vars/Ubuntu-xenial.yml

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

vars/main.yml

@@ -1,9 +0,0 @@
----
-
-php_packages:
-  - '{{ php_apt_prefix }}cli'
-  - '{{ php_apt_prefix }}curl'
-  - '{{ php_apt_prefix }}gd'
-  - '{{ php_apt_prefix }}mcrypt'
-  - '{{ php_mysql_package }}'
-  - '{{ php_apt_prefix }}intl'

vars/php-5.6.yml

@@ -1,8 +0,0 @@
----
-
-php_apt_prefix: 'php5-'
-php_etc_dir: '/etc/php5'
-php_fpm_service: 'php5-fpm'
-php_default_fpm_sock: '/var/run/php5-fpm.sock'
-php_mods_dir: '/etc/php5/mods-available'
-php_mysql_package: 'php5-mysqlnd'

vars/php-7.0.yml

@@ -1,8 +0,0 @@
----
-
-php_apt_prefix: 'php7.0-'
-php_etc_dir: '/etc/php/7.0'
-php_fpm_service: 'php7.0-fpm'
-php_default_fpm_sock: '/var/run/php/php7.0-fpm.sock'
-php_mods_dir: '/etc/php/7.0/mods-available'
-php_mysql_package: 'php7.0-mysql'

vars/php-7.1.yml

@@ -1,8 +0,0 @@
----
-
-php_apt_prefix: 'php7.1-'
-php_etc_dir: '/etc/php/7.1'
-php_fpm_service: 'php7.1-fpm'
-php_default_fpm_sock: '/var/run/php/php7.1-fpm.sock'
-php_mods_dir: '/etc/php/7.1/mods-available'
-php_mysql_package: 'php7.1-mysql'