From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 06 Aug 2015 03:18:44 -0400 Subject: [PATCH] - don't set password via remoting if field is empty --- server/conf/php_fpm_pool.conf.master | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master index b12644c..9bd7a3b 100644 --- a/server/conf/php_fpm_pool.conf.master +++ b/server/conf/php_fpm_pool.conf.master @@ -8,7 +8,7 @@ listen = <tmpl_var name='fpm_socket'> listen.owner = <tmpl_var name='fpm_user'> listen.group = <tmpl_var name='fpm_group'> -listen.mode = 0600 +listen.mode = <tmpl_var name='fpm_listen_mode'> </tmpl_if> user = <tmpl_var name='fpm_user'> @@ -28,13 +28,17 @@ chdir = / +env[TMP] = <tmpl_var name='document_root'>/tmp +env[TMPDIR] = <tmpl_var name='document_root'>/tmp +env[TEMP] = <tmpl_var name='document_root'>/tmp + <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'> 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