From f5895d64b8302c03b66a13e79a7eeb5951f962fd Mon Sep 17 00:00:00 2001 From: Hasan H. Gürsoy <h.guersoy@hhgag.com> Date: Sat, 12 Mar 2016 12:02:31 -0500 Subject: [PATCH] missing new line at the end of the line causes conflicts with the following line --- server/conf/php_fpm_pool.conf.master | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master index b60eb98..2ef6417 100644 --- a/server/conf/php_fpm_pool.conf.master +++ b/server/conf/php_fpm_pool.conf.master @@ -34,7 +34,9 @@ <tmpl_if name='security_level' op='==' value='20'> <tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'> -<tmpl_if name='custom_session_save_path' op='!=' value='y'>php_admin_value[session.save_path] = <tmpl_var name='document_root'>/tmp</tmpl_if> +<tmpl_if name='custom_session_save_path' op='!=' value='y'> +php_admin_value[session.save_path] = <tmpl_var name='document_root'>/tmp +</tmpl_if> php_admin_value[upload_tmp_dir] = <tmpl_var name='document_root'>/tmp php_admin_value[sendmail_path] = "/usr/sbin/sendmail -t -i -f webmaster@<tmpl_var name='domain'>" </tmpl_if> -- Gitblit v1.9.1