From 9b155852f4a352ddb793ac4252702170b6509c17 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 11 May 2014 17:39:51 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

---
 server/conf/php_fpm_pool.conf.master |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
index 37edbb7..a7a4c64 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 = 0660
+listen.mode = <tmpl_vare name='fpm_listen_mode'>
 </tmpl_if>
 
 user = <tmpl_var name='fpm_user'>

--
Gitblit v1.9.1