From 66cd0917bb0366929b54ec6953f2e25324c66cff Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 13 Jul 2017 18:26:03 +0200
Subject: [PATCH] Fixes in php-fpm template

---
 root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Dl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 c212fae..9317cec 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
@@ -1,8 +1,10 @@
 {
 
 if ($PHP_VERSION eq '56'){
-  if (($dl{status'} || 'disabled) eq 'enabled'){
+  if (($dl{'status'} || 'disabled') eq 'enabled'){
+    my $max_upload_size = ($dl{MaxUploadSize} || '4096') . 'M';
     $OUT .=<<_EOF;
+
 [php56-dl]
 user = www
 group = www
@@ -27,8 +29,8 @@ php_admin_flag[log_errors] = on
 php_admin_value[error_log] = syslog
 php_admin_value[memory_limit] = 128M
 php_admin_value[max_execution_time] = 0
-php_admin_value[post_max_size] = { $dl{MaxUploadSize} || '4096' }M
-php_admin_value[upload_max_filesize] = { $dl{MaxUploadSize} || '4096' }M
+php_admin_value[post_max_size] = $max_upload_size
+php_admin_value[upload_max_filesize] = $max_upload_size
 php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd
 php_admin_value[open_basedir] = /usr/share/dl:/etc/dl.php:/var/lib/dl:/var/log/dl.log
 php_admin_flag[allow_url_fopen] = off
@@ -37,6 +39,7 @@ php_admin_flag[session.cookie_httponly] = on
 php_admin_flag[allow_url_include] = off
 php_admin_value[session.save_handler] = files
 php_admin_value[output_buffering] = off
+
 _EOF
 
   }