Commit d2c5ed74 authored by Till Brehm's avatar Till Brehm
Browse files

- Changed php-fpm-socket listen mode to 0600.

- Enable php-fpm socket mode as default.
parent 465f2bbf
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';
...@@ -204,6 +204,7 @@ CREATE TABLE `client` ( ...@@ -204,6 +204,7 @@ CREATE TABLE `client` (
`limit_shell_user` int(11) NOT NULL DEFAULT '0', `limit_shell_user` int(11) NOT NULL DEFAULT '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot', `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot',
`limit_webdav_user` int(11) NOT NULL DEFAULT '0', `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_aps` int(11) NOT NULL DEFAULT '-1',
`default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1', `default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
`db_servers` blob NOT NULL, `db_servers` blob NOT NULL,
...@@ -313,6 +314,7 @@ CREATE TABLE `client_template` ( ...@@ -313,6 +314,7 @@ CREATE TABLE `client_template` (
`limit_shell_user` int(11) NOT NULL default '0', `limit_shell_user` int(11) NOT NULL default '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no', `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no',
`limit_webdav_user` int(11) NOT NULL default '0', `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_aps` int(11) NOT NULL DEFAULT '-1',
`limit_dns_zone` 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', `limit_dns_slave_zone` int(11) NOT NULL default '-1',
...@@ -1852,7 +1854,7 @@ CREATE TABLE `web_domain` ( ...@@ -1852,7 +1854,7 @@ CREATE TABLE `web_domain` (
`allow_override` varchar(255) NOT NULL default 'All', `allow_override` varchar(255) NOT NULL default 'All',
`apache_directives` mediumtext, `apache_directives` mediumtext,
`nginx_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` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'dynamic',
`pm_max_children` int(11) NOT NULL DEFAULT '10', `pm_max_children` int(11) NOT NULL DEFAULT '10',
`pm_start_servers` int(11) NOT NULL DEFAULT '2', `pm_start_servers` int(11) NOT NULL DEFAULT '2',
......
...@@ -8,7 +8,7 @@ listen.allowed_clients = 127.0.0.1 ...@@ -8,7 +8,7 @@ listen.allowed_clients = 127.0.0.1
listen = <tmpl_var name='fpm_socket'> listen = <tmpl_var name='fpm_socket'>
listen.owner = <tmpl_var name='fpm_user'> listen.owner = <tmpl_var name='fpm_user'>
listen.group = <tmpl_var name='fpm_group'> listen.group = <tmpl_var name='fpm_group'>
listen.mode = 0660 listen.mode = 0600
</tmpl_if> </tmpl_if>
user = <tmpl_var name='fpm_user'> user = <tmpl_var name='fpm_user'>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment