From febc76b26c9ad46e5399f28794d41105d7639e67 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 29 Sep 2021 16:40:25 +0200 Subject: [PATCH] php: fix tasks names --- php/tasks/main_bullseye.yml | 18 +++++++++--------- php/tasks/main_buster.yml | 18 +++++++++--------- php/tasks/main_jessie.yml | 16 ++++++++-------- php/tasks/main_stretch.yml | 18 +++++++++--------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/php/tasks/main_bullseye.yml b/php/tasks/main_bullseye.yml index bdeffe56..a1f7d5f5 100644 --- a/php/tasks/main_bullseye.yml +++ b/php/tasks/main_bullseye.yml @@ -1,6 +1,6 @@ --- -- name: "Set variables (Debian 10 or later)" +- name: "Set variables (Debian 11)" set_fact: php_cli_defaults_ini_file: /etc/php/7.4/cli/conf.d/z-evolinux-defaults.ini php_cli_custom_ini_file: /etc/php/7.4/cli/conf.d/zzz-evolinux-custom.ini @@ -16,7 +16,7 @@ # Packages -- name: "Set package list (Debian 9 or later)" +- name: "Set package list (Debian 11)" set_fact: php_stretch_packages: - php-cli @@ -37,12 +37,12 @@ - include: sury_pre.yml when: php_sury_enable -- name: "Install PHP packages (Debian 9 or later)" +- name: "Install PHP packages (Debian 11)" apt: name: '{{ php_stretch_packages }}' state: present -- name: "Install mod_php packages (Debian 9 or later)" +- name: "Install mod_php packages (Debian 11)" apt: name: - libapache2-mod-php @@ -50,7 +50,7 @@ state: present when: php_apache_enable -- name: "Install PHP FPM packages (Debian 9 or later)" +- name: "Install PHP FPM packages (Debian 11)" apt: name: - php-fpm @@ -60,7 +60,7 @@ # Configuration -- name: Enforce permissions on PHP directory +- name: "Enforce permissions on PHP directory (Debian 11)" file: dest: "{{ item }}" mode: "0755" @@ -69,7 +69,7 @@ - /etc/php/7.4 - include: config_cli.yml -- name: Enforce permissions on PHP cli directory +- name: "Enforce permissions on PHP cli directory (Debian 11)" file: dest: /etc/php/7.4/cli mode: "0755" @@ -77,7 +77,7 @@ - include: config_fpm.yml when: php_fpm_enable -- name: Enforce permissions on PHP fpm directory +- name: "Enforce permissions on PHP fpm directory (Debian 11)" file: dest: /etc/php/7.4/fpm mode: "0755" @@ -86,7 +86,7 @@ - include: config_apache.yml when: php_apache_enable -- name: Enforce permissions on PHP apache2 directory +- name: "Enforce permissions on PHP apache2 directory (Debian 11)" file: dest: /etc/php/7.4/apache2 mode: "0755" diff --git a/php/tasks/main_buster.yml b/php/tasks/main_buster.yml index fba952ab..2fc4293e 100644 --- a/php/tasks/main_buster.yml +++ b/php/tasks/main_buster.yml @@ -1,6 +1,6 @@ --- -- name: "Set variables (Debian 10 or later)" +- name: "Set variables (Debian 10)" set_fact: php_cli_defaults_ini_file: /etc/php/7.3/cli/conf.d/z-evolinux-defaults.ini php_cli_custom_ini_file: /etc/php/7.3/cli/conf.d/zzz-evolinux-custom.ini @@ -16,7 +16,7 @@ # Packages -- name: "Set package list (Debian 9 or later)" +- name: "Set package list (Debian 10)" set_fact: php_stretch_packages: - php-cli @@ -38,12 +38,12 @@ - include: sury_pre.yml when: php_sury_enable | bool -- name: "Install PHP packages (Debian 9 or later)" +- name: "Install PHP packages (Debian 10)" apt: name: '{{ php_stretch_packages }}' state: present -- name: "Install mod_php packages (Debian 9 or later)" +- name: "Install mod_php packages (Debian 10)" apt: name: - libapache2-mod-php @@ -51,7 +51,7 @@ state: present when: php_apache_enable | bool -- name: "Install PHP FPM packages (Debian 9 or later)" +- name: "Install PHP FPM packages (Debian 10)" apt: name: - php-fpm @@ -61,7 +61,7 @@ # Configuration -- name: Enforce permissions on PHP directory +- name: "Enforce permissions on PHP directory (Debian 10)" file: dest: "{{ item }}" mode: "0755" @@ -70,7 +70,7 @@ - /etc/php/7.3 - include: config_cli.yml -- name: Enforce permissions on PHP cli directory +- name: "Enforce permissions on PHP cli directory (Debian 10)" file: dest: /etc/php/7.3/cli mode: "0755" @@ -78,7 +78,7 @@ - include: config_fpm.yml when: php_fpm_enable | bool -- name: Enforce permissions on PHP fpm directory +- name: "Enforce permissions on PHP fpm directory (Debian 10)" file: dest: /etc/php/7.3/fpm mode: "0755" @@ -87,7 +87,7 @@ - include: config_apache.yml when: php_apache_enable | bool -- name: Enforce permissions on PHP apache2 directory +- name: "Enforce permissions on PHP apache2 directory (Debian 10)" file: dest: /etc/php/7.3/apache2 mode: "0755" diff --git a/php/tasks/main_jessie.yml b/php/tasks/main_jessie.yml index 5ec3123d..75105166 100644 --- a/php/tasks/main_jessie.yml +++ b/php/tasks/main_jessie.yml @@ -1,6 +1,6 @@ --- -- name: "Set variables (jessie)" +- name: "Set variables (Debian 8)" set_fact: php_cli_defaults_ini_file: /etc/php5/cli/conf.d/z-evolinux-defaults.ini php_cli_custom_ini_file: /etc/php5/cli/conf.d/zzz-evolinux-custom.ini @@ -16,7 +16,7 @@ # Packages -- name: "Install PHP packages (jessie)" +- name: "Install PHP packages (Debian 8)" apt: name: - php5-cli @@ -34,7 +34,7 @@ - libphp-phpmailer state: present -- name: "Install mod_php packages (jessie)" +- name: "Install mod_php packages (Debian 8)" apt: name: - libapache2-mod-php5 @@ -42,7 +42,7 @@ state: present when: php_apache_enable | bool -- name: "Install PHP FPM packages (jessie)" +- name: "Install PHP FPM packages (Debian 8)" apt: name: - php5-fpm @@ -52,14 +52,14 @@ # Configuration -- name: Enforce permissions on PHP directory +- name: Enforce permissions on PHP directory (Debian 8) file: dest: /etc/php5 mode: "0755" - include: config_cli.yml -- name: Enforce permissions on PHP cli directory +- name: Enforce permissions on PHP cli directory (Debian 8) file: dest: /etc/php5/cli mode: "0755" @@ -67,7 +67,7 @@ - include: config_fpm.yml when: php_fpm_enable | bool -- name: Enforce permissions on PHP fpm directory +- name: Enforce permissions on PHP fpm directory (Debian 8) file: dest: /etc/php5/fpm mode: "0755" @@ -76,7 +76,7 @@ - include: config_apache.yml when: php_apache_enable | bool -- name: Enforce permissions on PHP apache2 directory +- name: Enforce permissions on PHP apache2 directory (Debian 8) file: dest: /etc/php5/apache2 mode: "0755" diff --git a/php/tasks/main_stretch.yml b/php/tasks/main_stretch.yml index dc16c6e4..698621ac 100644 --- a/php/tasks/main_stretch.yml +++ b/php/tasks/main_stretch.yml @@ -1,6 +1,6 @@ --- -- name: "Set variables (Debian 9 or later)" +- name: "Set variables (Debian 9)" set_fact: php_cli_defaults_ini_file: /etc/php/7.0/cli/conf.d/z-evolinux-defaults.ini php_cli_custom_ini_file: /etc/php/7.0/cli/conf.d/zzz-evolinux-custom.ini @@ -16,7 +16,7 @@ # Packages -- name: "Set package list (Debian 9 or later)" +- name: "Set package list (Debian 9)" set_fact: php_stretch_packages: - php-cli @@ -38,12 +38,12 @@ - include: sury_pre.yml when: php_sury_enable | bool -- name: "Install PHP packages (Debian 9 or later)" +- name: "Install PHP packages (Debian 9)" apt: name: '{{ php_stretch_packages }}' state: present -- name: "Install mod_php packages (Debian 9 or later)" +- name: "Install mod_php packages (Debian 9)" apt: name: - libapache2-mod-php @@ -51,7 +51,7 @@ state: present when: php_apache_enable | bool -- name: "Install PHP FPM packages (Debian 9 or later)" +- name: "Install PHP FPM packages (Debian 9)" apt: name: - php-fpm @@ -61,7 +61,7 @@ # Configuration -- name: Enforce permissions on PHP directory +- name: "Enforce permissions on PHP directory (Debian 9)" file: dest: "{{ item }}" mode: "0755" @@ -71,7 +71,7 @@ - include: config_cli.yml -- name: Enforce permissions on PHP cli directory +- name: "Enforce permissions on PHP cli directory (Debian 9)" file: dest: /etc/php/7.0/cli mode: "0755" @@ -79,7 +79,7 @@ - include: config_fpm.yml when: php_fpm_enable | bool -- name: Enforce permissions on PHP fpm directory +- name: "Enforce permissions on PHP fpm directory (Debian 9)" file: dest: /etc/php/7.0/fpm mode: "0755" @@ -88,7 +88,7 @@ - include: config_apache.yml when: php_apache_enable | bool -- name: Enforce permissions on PHP apache2 directory +- name: "Enforce permissions on PHP apache2 directory (Debian 9)" file: dest: /etc/php/7.0/apache2 mode: "0755"