From 85cab7d1668ff8278008db75a7797936e883a914 Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Thu, 6 Oct 2022 12:14:55 +0200 Subject: [PATCH] Fix lint errors due to ansible-lint latest versions --- README.md | 6 +++--- meta/main.yml | 4 +++- tasks/main.yml | 8 +++++--- tasks/opcache.yml | 11 ++++++----- tasks/xdebug.yml | 11 ++++++----- tests/test.yml | 19 ++++++++++--------- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 78ab819..186b24c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ 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://app.travis-ci.com/HanXHX/ansible-php.svg?branch=master)](https://app.travis-ci.com/HanXHX/ansible-php) +[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-hanxhx.php-blue.svg)](https://galaxy.ansible.com/hanxhx.php) [![Build Status](https://app.travis-ci.com/HanXHX/ansible-php.svg?branch=master)](https://app.travis-ci.com/HanXHX/ansible-php) Install PHP on Debian / Ubuntu / FreeBSD. Manage PHP-FPM, APCu, Opcache and Xdebug. @@ -161,14 +161,14 @@ Example Playbook - hosts: servers roles: - - { role: HanXHX.php } + - { role: hanxhx.php } ### Debian Bullseye with PHP 8.0 CLI (no FPM) - hosts: servers roles: - { role: HanXHX.sury } - - { role: HanXHX.php, php_version: '8.0', php_install_fpm: false } + - { role: hanxhx.php, php_version: '8.0', php_install_fpm: false } License ------- diff --git a/meta/main.yml b/meta/main.yml index 3fde8d4..2d3aac1 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,7 +1,9 @@ --- galaxy_info: author: Emilien Mantel - description: Install and configure PHP 7.0/7.1/7.2/7.3/7.4/8.0 + role_name: php + namespace: hanxhx + description: Install and configure PHP 7.x/8.x company: license: GPLv2 min_ansible_version: 2.11 diff --git a/tasks/main.yml b/tasks/main.yml index 52444ed..1f72e15 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -60,6 +60,8 @@ group: root mode: 0644 register: f + tags: + - skip_ansible_lint - name: SETUP | Gathers new facts ansible.builtin.setup: @@ -107,7 +109,9 @@ state: started when: php_install_fpm and ansible_virtualization_type != 'docker' -- block: +- name: BLOCK | Ensure PHP-FPM is started if running on Docker + when: php_install_fpm and ansible_virtualization_type == 'docker' + block: - name: COMMAND | Check if PHP-FPM is started (Docker) ansible.builtin.command: 'service {{ php_fpm_service }} status' @@ -122,5 +126,3 @@ args: warn: false when: dps.stdout.find('is not running') != -1 - - when: php_install_fpm and ansible_virtualization_type == 'docker' diff --git a/tasks/opcache.yml b/tasks/opcache.yml index ce3dac9..c7144c4 100644 --- a/tasks/opcache.yml +++ b/tasks/opcache.yml @@ -1,6 +1,8 @@ --- -- block: +- name: Install opcache/apcu on Debian + when: ansible_os_family == 'Debian' + block: - name: APT | Install APCu ansible.builtin.apt: @@ -12,9 +14,10 @@ pkg: "{{ php_package_prefix }}opcache" install_recommends: false - when: ansible_os_family == 'Debian' -- block: +- name: Install opcache/apcu on FreeBSD + when: ansible_os_family == 'FreeBSD' + block: - name: PKGNG | Install APCu community.general.pkgng: @@ -24,8 +27,6 @@ community.general.pkgng: name: "{{ php_package_prefix }}opcache" - when: ansible_os_family == 'FreeBSD' - - name: TEMPLATE | Configure Opcache ansible.builtin.template: src: "etc/__php__/mods-available/opcache.ini.j2" diff --git a/tasks/xdebug.yml b/tasks/xdebug.yml index 11ef482..a4e3ddc 100644 --- a/tasks/xdebug.yml +++ b/tasks/xdebug.yml @@ -1,6 +1,8 @@ --- -- block: +- name: BLOCK | Uninstall xdebug + when: php_install_xdebug + block: - name: APT | Install xdebug ansible.builtin.apt: @@ -24,9 +26,10 @@ mode: 0644 notify: restart php-fpm - when: php_install_xdebug -- block: +- name: BLOCK | Uninstall xdebug + when: not php_install_xdebug + block: - name: APT | Uninstall xdebug ansible.builtin.apt: @@ -39,5 +42,3 @@ name: "{{ php_xdebug_package }}" state: absent when: ansible_os_family == 'FreeBSD' - - when: not php_install_xdebug diff --git a/tests/test.yml b/tests/test.yml index 5e722df..a1ea551 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -1,6 +1,7 @@ --- - hosts: all + name: Test all vars: vhost: 'test.local' php_extra_packages: @@ -46,7 +47,7 @@ - name: TEMPLATE | Nginx site config ansible.builtin.template: src: "templates/nginx.conf.j2" - dest: "{{ __nginx_conf }}" + dest: "{{ __nginx_conf }}" mode: 0644 owner: root group: root @@ -71,7 +72,9 @@ state: started when: ansible_virtualization_type != 'docker' - - block: + - name: Start nginx if testing with Docker + when: ansible_virtualization_type == 'docker' + block: - name: COMMAND | Docker nginx status ansible.builtin.command: service nginx status @@ -87,17 +90,15 @@ warn: false when: ngs.stdout.find('nginx is not running') != -1 - when: ansible_virtualization_type == 'docker' - handlers: - - name: reload nginx + - name: Reload nginx ansible.builtin.service: name: nginx state: reloaded notify: docker reload nginx - - name: docker reload nginx + - name: Docker reload nginx ansible.builtin.command: service nginx reload args: warn: false @@ -168,7 +169,9 @@ url: "http://localhost{{ php_fpm_poold.0.status_path }}" when: php_fpm_poold.0.status_path is defined - - block: + - name: Debian extra checks + when: ansible_os_family == 'Debian' + block: - name: SHELL | Check if we installed multiple PHP versions ansible.builtin.shell: set -o pipefail && (dpkg -l | grep 'php[[:digit:]].*common' | wc -l) @@ -183,5 +186,3 @@ ansible.builtin.fail: msg: "Multiple PHP versions detected" when: check_multiple_php.stdout != '1' - - when: ansible_os_family == 'Debian'