From 31df2d2fbc8696256a866e203db70100d68fc521 Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Tue, 12 Nov 2019 12:17:44 +0100 Subject: [PATCH] php: Add a task to remove Debian's default FPM pool file (off by default) Can be triggered by switching php_fpm_remove_default_pool to True. --- CHANGELOG.md | 1 + php/defaults/main.yml | 2 ++ php/tasks/config_fpm.yml | 7 +++++++ php/tasks/main_buster.yml | 1 + php/tasks/main_jessie.yml | 1 + php/tasks/main_stretch.yml | 1 + 6 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00da6528..1f7792ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ The **patch** part changes incrementally at each release. * php: Don't set a chroot for the default fpm pool * php: Make sure the default pool we define can be fully functionnal witout debian's default pool file * php: Change the default pool names to something more explicit (and same for the variables names) +* php: Add a task to remove Debian's default FPM pool file (off by default) * rbenv: install Ruby 2.6.5 by default * squid: Remove wait time when we turn off squid * squid: compatibility wit Debian 10 diff --git a/php/defaults/main.yml b/php/defaults/main.yml index 52717e4b..19040baf 100644 --- a/php/defaults/main.yml +++ b/php/defaults/main.yml @@ -6,3 +6,5 @@ php_apache_enable: False php_symfony_requirements: False php_modules_mysqlnd: False + +php_fpm_remove_default_pool: False diff --git a/php/tasks/config_fpm.yml b/php/tasks/config_fpm.yml index 7bad5f7d..4c6c855e 100644 --- a/php/tasks/config_fpm.yml +++ b/php/tasks/config_fpm.yml @@ -80,3 +80,10 @@ - { option: "date.timezone", value: "Europe/Paris" } notify: "restart {{ php_fpm_service_name }}" when: php_symfony_requirements + +- name: Delete debian default pool + file: + path: "{{ php_fpm_debian_default_pool_file }}" + state: absent + notify: "restart {{ php_fpm_service_name }}" + when: php_fpm_remove_default_pool diff --git a/php/tasks/main_buster.yml b/php/tasks/main_buster.yml index 586e698a..240f9b54 100644 --- a/php/tasks/main_buster.yml +++ b/php/tasks/main_buster.yml @@ -8,6 +8,7 @@ php_apache_custom_ini_file: /etc/php/7.3/apache2/conf.d/zzz-evolinux-custom.ini php_fpm_defaults_ini_file: /etc/php/7.3/fpm/conf.d/z-evolinux-defaults.ini php_fpm_custom_ini_file: /etc/php/7.3/fpm/conf.d/zzz-evolinux-custom.ini + php_fpm_debian_default_pool_file: /etc/php/7.3/fpm/pool.d/www.conf php_fpm_default_pool_file: /etc/php/7.3/fpm/pool.d/www-evolinux-defaults.conf php_fpm_default_pool_custom_file: /etc/php/7.3/fpm/pool.d/www-evolinux-zcustom.conf php_fpm_default_pool_socket: /var/run/php/php7.3-fpm.sock diff --git a/php/tasks/main_jessie.yml b/php/tasks/main_jessie.yml index 1c76cfc7..fdeed8c8 100644 --- a/php/tasks/main_jessie.yml +++ b/php/tasks/main_jessie.yml @@ -8,6 +8,7 @@ php_apache_custom_ini_file: /etc/php5/apache2/conf.d/zzz-evolinux-custom.ini php_fpm_defaults_ini_file: /etc/php5/fpm/conf.d/z-evolinux-defaults.ini php_fpm_custom_ini_file: /etc/php5/fpm/conf.d/zzz-evolinux-custom.ini + php_fpm_debian_default_pool_file: /etc/php5/fpm/pool.d/www.conf php_fpm_default_pool_file: /etc/php5/fpm/pool.d/www-evolinux-defaults.conf php_fpm_default_pool_custom_file: /etc/php5/fpm/pool.d/www-evolinux-zcustom.conf php_fpm_default_pool_socket: /var/run/php/php5-fpm.sock diff --git a/php/tasks/main_stretch.yml b/php/tasks/main_stretch.yml index cbbc16f6..75f69ab0 100644 --- a/php/tasks/main_stretch.yml +++ b/php/tasks/main_stretch.yml @@ -8,6 +8,7 @@ php_apache_custom_ini_file: /etc/php/7.0/apache2/conf.d/zzz-evolinux-custom.ini php_fpm_defaults_ini_file: /etc/php/7.0/fpm/conf.d/z-evolinux-defaults.ini php_fpm_custom_ini_file: /etc/php/7.0/fpm/conf.d/zzz-evolinux-custom.ini + php_fpm_debian_default_pool_file: /etc/php/7.0/fpm/pool.d/www.conf php_fpm_default_pool_file: /etc/php/7.0/fpm/pool.d/www-evolinux-defaults.conf php_fpm_default_pool_custom_file: /etc/php/7.0/fpm/pool.d/www-evolinux-zcustom.conf php_fpm_default_pool_socket: /var/run/php/php7.0-fpm.sock