From e71cffd8fd53d59814f21b3cd4dae16b028a966a Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Mon, 28 Aug 2023 17:08:33 +0200 Subject: [PATCH] php: add new variable to disable oveeriding settings of php-fpm default pool (www) --- CHANGELOG.md | 1 + php/defaults/main.yml | 13 +++++++------ php/tasks/config_fpm.yml | 6 ++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51959413..37331aa5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * fail2ban: add default variable fail2ban_dbpurgeage_default * fail2ban: add variable fail2ban_sshd_port to configure sshd port * nagios-nrpe: add a NRPE check-local command with completion. +* php: add new variable to disable oveeriding settings of php-fpm default pool (www) * policy_pam: New role allowing to manage password policy with pam_pwquality & pam_pwhistory * userlogrotate: add a userlogpurge script disabled by default * userlogrotate: new version, with separate conf file diff --git a/php/defaults/main.yml b/php/defaults/main.yml index 2e633d0f..e43f01eb 100644 --- a/php/defaults/main.yml +++ b/php/defaults/main.yml @@ -1,12 +1,13 @@ --- -php_sury_enable: False -php_fpm_enable: False -php_apache_enable: False -php_symfony_requirements: False +php_sury_enable: false +php_fpm_enable: false +php_apache_enable: false +php_symfony_requirements: false -php_modules_mysqlnd: False +php_modules_mysqlnd: false -php_fpm_remove_default_pool: False +php_fpm_remove_default_pool: false +php_fpm_override_default_pool: true apt_keyring_dir: "{{ ansible_distribution_major_version is version('12', '<') | ternary('/etc/apt/trusted.gpg.d', '/etc/apt/keyrings') }}" \ No newline at end of file diff --git a/php/tasks/config_fpm.yml b/php/tasks/config_fpm.yml index 836559bf..690c050e 100644 --- a/php/tasks/config_fpm.yml +++ b/php/tasks/config_fpm.yml @@ -35,7 +35,7 @@ force: false notify: "restart {{ php_fpm_service_name }}" -- name: Set default PHP FPM values +- name: Set default pool (www) config values community.general.ini_file: dest: "{{ php_fpm_default_pool_file }}" section: www @@ -57,7 +57,9 @@ - { option: "pm.status_path", value: "/fpm_status" } - { option: "request_terminate_timeout", value: "60s" } notify: "restart {{ php_fpm_service_name }}" - when: ansible_distribution_major_version is version('9', '>=') + when: + - ansible_distribution_major_version is version('9', '>=') + - php_fpm_override_default_pool - name: Custom PHP FPM values ansible.builtin.copy: