From d2c5ed744b3ded87b2735ed26f45ae2836d2bedc Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 9 Apr 2014 19:11:30 +0200
Subject: [PATCH] - Changed php-fpm-socket listen mode to 0600. - Enable
 php-fpm socket mode as default.

---
 install/sql/incremental/upd_0073.sql | 3 +++
 install/sql/ispconfig3.sql           | 4 +++-
 server/conf/php_fpm_pool.conf.master | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 install/sql/incremental/upd_0073.sql

diff --git a/install/sql/incremental/upd_0073.sql b/install/sql/incremental/upd_0073.sql
new file mode 100644
index 000000000..3dcbc366a
--- /dev/null
+++ b/install/sql/incremental/upd_0073.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `client_template` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
+ALTER TABLE `client` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
+ALTER TABLE  `web_domain` CHANGE  `php_fpm_use_socket`  `php_fpm_use_socket` ENUM(  'n',  'y' ) NOT NULL DEFAULT  'y';
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 2e0d3de30..72ec00c77 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -204,6 +204,7 @@ CREATE TABLE `client` (
   `limit_shell_user` int(11) NOT NULL DEFAULT '0',
   `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot',
   `limit_webdav_user` int(11) NOT NULL DEFAULT '0',
+  `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
   `limit_aps` int(11) NOT NULL DEFAULT '-1',
   `default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
   `db_servers` blob NOT NULL,
@@ -313,6 +314,7 @@ CREATE TABLE `client_template` (
   `limit_shell_user` int(11) NOT NULL default '0',
   `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no',
   `limit_webdav_user` int(11) NOT NULL default '0',
+  `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
   `limit_aps` int(11) NOT NULL DEFAULT '-1',
   `limit_dns_zone` int(11) NOT NULL default '-1',
   `limit_dns_slave_zone` int(11) NOT NULL default '-1',
@@ -1852,7 +1854,7 @@ CREATE TABLE `web_domain` (
   `allow_override` varchar(255) NOT NULL default 'All',
   `apache_directives` mediumtext,
   `nginx_directives` mediumtext,
-  `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'n',
+  `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'y',
   `pm` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'dynamic',
   `pm_max_children` int(11) NOT NULL DEFAULT '10',
   `pm_start_servers` int(11) NOT NULL DEFAULT '2',
diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
index 37edbb7f4..b12644c62 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 = 0660
+listen.mode = 0600
 </tmpl_if>
 
 user = <tmpl_var name='fpm_user'>
-- 
GitLab