From 9d8dcb147cdd07edddb36fe65b3975f373977152 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 14 Jul 2017 11:52:30 +0200
Subject: [PATCH] Cleanups in fpm pool template

---
 root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Dl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Dl b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Dl
index 9317cec..885bacd 100644
--- a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Dl
+++ b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Dl
@@ -3,25 +3,26 @@
 if ($PHP_VERSION eq '56'){
   if (($dl{'status'} || 'disabled') eq 'enabled'){
     my $max_upload_size = ($dl{MaxUploadSize} || '4096') . 'M';
+    my $id = 'dl';
     $OUT .=<<_EOF;
 
-[php56-dl]
+[php$PHP_VERSION-$id]
 user = www
 group = www
 listen.owner = root
 listen.group = www
 listen.mode = 0660
-listen = /var/run/php-fpm/php56-dl.sock
+listen = /var/run/php-fpm/php$PHP_VERSION-$id.sock
 pm = dynamic
 pm.max_children = 15
 pm.start_servers = 3
 pm.min_spare_servers = 3
 pm.max_spare_servers = 4
 pm.max_requests = 5000
-php_admin_value[session.save_path] = /var/lib/php/dl/session
-php_admin_value[opcache.file_cache]  = /var/lib/php/dl/opcache
-php_admin_value[upload_tmp_dir] = /var/lib/php/dl/tmp
-php_admin_value[error_log] = /var/log/php/dl/error.log
+php_admin_value[session.save_path] = /var/lib/php/$id/session
+php_admin_value[opcache.file_cache]  = /var/lib/php/$id/opcache
+php_admin_value[upload_tmp_dir] = /var/lib/php/$id/tmp
+php_admin_value[error_log] = /var/log/php/$id/error.log
 slowlog = /var/log/php/dl/slow.log
 php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
 php_admin_flag[display_errors] = off