From 585a8d04ac82b9e9202c2157823d6351bdcc271e Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Tue, 12 Nov 2019 12:14:36 +0100 Subject: [PATCH] php: Change the default pool names to something more explicit (and same for the variables names) Because it's more than just pure configuration, but a fpm pool definition, I've changed the following variables in Ansible : - php_fpm_defaults_conf_file to replaced by php_fpm_default_pool_file - php_fpm_custom_conf_file to php_fpm_default_pool_custom_file. On the FPM side, I've also changed the files names of the pool to make them more explicit. No more z and zzz. It's the www pool, so let's put www in the file name for coherence : - z-evolinux-defaults.conf changes to www-evolinux-defaults.conf - zzz-evolinux-custom.conf changes to www-evolinux-zcustom.conf --- CHANGELOG.md | 1 + php/tasks/config_fpm.yml | 4 ++-- php/tasks/main_buster.yml | 4 ++-- php/tasks/main_jessie.yml | 4 ++-- php/tasks/main_stretch.yml | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bd8d330..96104ce3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ The **patch** part changes incrementally at each release. * php: By default, allow 128M for OpCache (instead of 64M) * 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) * 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/tasks/config_fpm.yml b/php/tasks/config_fpm.yml index 50a7d255..28413215 100644 --- a/php/tasks/config_fpm.yml +++ b/php/tasks/config_fpm.yml @@ -37,7 +37,7 @@ - name: Set default PHP FPM values ini_file: - dest: "{{ php_fpm_defaults_conf_file }}" + dest: "{{ php_fpm_default_pool_file }}" section: www option: "{{ item.option }}" value: "{{ item.value }}" @@ -61,7 +61,7 @@ - name: Custom PHP FPM values copy: - dest: "{{ php_fpm_custom_conf_file }}" + dest: "{{ php_fpm_default_pool_custom_file }}" content: | ; Put customized values here. ; default_charset = "ISO-8859-1" diff --git a/php/tasks/main_buster.yml b/php/tasks/main_buster.yml index d843c07d..54425577 100644 --- a/php/tasks/main_buster.yml +++ b/php/tasks/main_buster.yml @@ -8,8 +8,8 @@ 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_defaults_conf_file: /etc/php/7.3/fpm/pool.d/z-evolinux-defaults.conf - php_fpm_custom_conf_file: /etc/php/7.3/fpm/pool.d/zzz-evolinux-custom.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 php_fpm_service_name: php7.3-fpm diff --git a/php/tasks/main_jessie.yml b/php/tasks/main_jessie.yml index a1ec2700..433d3467 100644 --- a/php/tasks/main_jessie.yml +++ b/php/tasks/main_jessie.yml @@ -8,8 +8,8 @@ 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_defaults_conf_file: /etc/php5/fpm/pool.d/z-evolinux-defaults.conf - php_fpm_custom_conf_file: /etc/php5/fpm/pool.d/zzz-evolinux-custom.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 php_fpm_service_name: php5-fpm diff --git a/php/tasks/main_stretch.yml b/php/tasks/main_stretch.yml index 76c62538..070829ff 100644 --- a/php/tasks/main_stretch.yml +++ b/php/tasks/main_stretch.yml @@ -8,8 +8,8 @@ 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_defaults_conf_file: /etc/php/7.0/fpm/pool.d/z-evolinux-defaults.conf - php_fpm_custom_conf_file: /etc/php/7.0/fpm/pool.d/zzz-evolinux-custom.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 php_fpm_service_name: php7.0-fpm