CHANGELOG.md

@@ -55,6 +55,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

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"

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
 

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
 

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