From 27448561e2c1ce008a1e2667aa143753a2ec9df6 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 5 Jul 2017 22:29:45 +0200 Subject: [PATCH] Use php56-php-fpm entry to get conf instead of php56 --- .../etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default00Header | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default00Header b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default00Header index 4fc5131..d66024e 100644 --- a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default00Header +++ b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default00Header @@ -1,7 +1,7 @@ { use esmith::ConfigDB; my $c = esmith::ConfigDB->open_ro || die "Couldn't opeen the configuration database\n"; -my $php = $c->get( 'php' . $PHP_VERSION ); +my $php = $c->get( 'php' . $PHP_VERSION . '-php-fpm' ); if ($php){ $MemoryLimit = $php->prop('MemoryLimit') || '128M'; $MaxExecutionTime = $php->prop('MaxExecutionTime') || '30'; @@ -10,7 +10,10 @@ if ($php){ $PostMaxSize = $php->prop('PostMaxSize') || '10M'; $UploadMaxFilesize = $php->prop('UploadMaxFilesize') || '10M'; $OpenBasedir = $php->prop('OpenBasedir') || undef; - $DisableFunctions = $php->prop('DisableFunctions') || 'system,show_source,symlink,exec,dl,shell_exec,passthru,phpinfo,escapeshellarg,escapeshellcmd'; + $DisableFunctions = $php->prop('DisableFunctions') || 'system,show_source,' . + 'symlink,exec,dl,shell_exec,' . + 'passthru,phpinfo,' . + 'escapeshellarg,escapeshellcmd'; } return ""; }