From ee40c2cdcca659775dfccd207364ee75189d5277 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 14 Feb 2019 16:01:33 +0100
Subject: [PATCH] Fixed problem with php-fpm-chroot field in web_domain table.
---
install/sql/incremental/upd_0087.sql | 1 -
install/sql/incremental/upd_dev_collection.sql | 1 +
install/sql/ispconfig3.sql | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
delete mode 100644 install/sql/incremental/upd_0087.sql
diff --git a/install/sql/incremental/upd_0087.sql b/install/sql/incremental/upd_0087.sql
deleted file mode 100644
index e1b35b0387..0000000000
--- a/install/sql/incremental/upd_0087.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `web_domain` ADD COLUMN `php_fpm_chroot` enum('n','y') NOT NULL DEFAULT 'n' AFTER `php_fpm_use_socket`;
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index f06e449746..98e8abdf97 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -1,3 +1,4 @@
ALTER TABLE `sys_datalog` ADD `session_id` varchar(64) NOT NULL DEFAULT '' AFTER `error`;
ALTER TABLE `sys_user` CHANGE `sys_userid` `sys_userid` INT(11) UNSIGNED NOT NULL DEFAULT '1' COMMENT 'Created by userid';
ALTER TABLE `sys_user` CHANGE `sys_groupid` `sys_groupid` INT(11) UNSIGNED NOT NULL DEFAULT '1' COMMENT 'Created by groupid';
+ALTER TABLE `web_domain` ADD COLUMN `php_fpm_chroot` enum('n','y') NOT NULL DEFAULT 'n' AFTER `php_fpm_use_socket`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 79dfde3275..88eff32ff0 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1965,6 +1965,7 @@ CREATE TABLE `web_domain` (
`apache_directives` mediumtext,
`nginx_directives` mediumtext,
`php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'y',
+ `php_fpm_chroot` enum('n','y') NOT NULL DEFAULT 'n',
`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',
--
GitLab