From 92edaf22dd892540ebf5a415464c6434ce72fb20 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Wed, 05 Aug 2015 02:34:53 -0400 Subject: [PATCH] Merge branch 'fs3933' into 'master' --- server/conf/php_fpm_pool.conf.master | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master index d7a3478..9bd7a3b 100644 --- a/server/conf/php_fpm_pool.conf.master +++ b/server/conf/php_fpm_pool.conf.master @@ -36,9 +36,9 @@ <tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'> php_admin_value[session.save_path] = <tmpl_var name='document_root'>/tmp php_admin_value[upload_tmp_dir] = <tmpl_var name='document_root'>/tmp -php_admin_value[sendmail_path] = "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>" +php_admin_value[sendmail_path] = "/usr/sbin/sendmail -t -i -f webmaster@<tmpl_var name='domain'>" </tmpl_if> <tmpl_loop name="custom_php_ini_settings"> <tmpl_var name='ini_setting'> -</tmpl_loop> \ No newline at end of file +</tmpl_loop> -- Gitblit v1.9.1