From 1890caf08f2c3680c3286b09be69620fe09ae947 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 16 Apr 2014 09:55:23 +0200
Subject: [PATCH] Set php-fpm listen mode to 0600 on apache servers and 0660 on
nginx servers.
---
server/conf/php_fpm_pool.conf.master | 2 +-
server/plugins-available/apache2_plugin.inc.php | 1 +
server/plugins-available/nginx_plugin.inc.php | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
index b12644c62f..a7a4c64154 100644
--- a/server/conf/php_fpm_pool.conf.master
+++ b/server/conf/php_fpm_pool.conf.master
@@ -8,7 +8,7 @@ listen.allowed_clients = 127.0.0.1
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_vare name='fpm_listen_mode'>
</tmpl_if>
user = <tmpl_var name='fpm_user'>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index dcbcdd9fe3..7f8b0d0eb0 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -2642,6 +2642,7 @@ class apache2_plugin {
$fpm_socket = $socket_dir.$pool_name.'.sock';
$tpl->setVar('fpm_socket', $fpm_socket);
+ $tpl->setVar('fpm_listen_mode', '0600');
$tpl->setVar('fpm_pool', $pool_name);
$tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index bf6fc20698..f35b27b892 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -2344,6 +2344,7 @@ class nginx_plugin {
$fpm_socket = $socket_dir.$pool_name.'.sock';
$tpl->setVar('fpm_socket', $fpm_socket);
+ $tpl->setVar('fpm_listen_mode', '0660');
$tpl->setVar('fpm_pool', $pool_name);
$tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);
--
GitLab