From c3f4ffccc70141e979187af510b59539e4fde439 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Mon, 8 Jun 2020 14:28:35 -0600
Subject: [PATCH] default php-fpm to use ondemand mode
---
install/sql/incremental/upd_dev_collection.sql | 3 +++
install/sql/ispconfig3.sql | 2 +-
interface/web/sites/form/web_vhost_domain.tform.php | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 1acc274a99..c53f31b307 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -16,3 +16,6 @@ ALTER TABLE `web_backup` ADD `backup_password` VARCHAR( 255 ) NOT NULL DEFAULT
-- rename Comodo to "Sectigo / Comodo CA"
UPDATE `dns_ssl_ca` SET `ca_name` = 'Sectigo / Comodo CA' WHERE `ca_issue` = 'comodoca.com';
+
+-- default php-fpm to ondemand mode
+ALTER TABLE `web_domain` ALTER pm SET DEFAULT 'ondemand';
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index b64eab94c3..3908cf382b 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -2046,7 +2046,7 @@ CREATE TABLE `web_domain` (
`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` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'ondemand',
`pm_max_children` int(11) NOT NULL DEFAULT '10',
`pm_start_servers` int(11) NOT NULL DEFAULT '2',
`pm_min_spare_servers` int(11) NOT NULL DEFAULT '1',
diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php
index 24ee6d4e62..beb952bfe6 100644
--- a/interface/web/sites/form/web_vhost_domain.tform.php
+++ b/interface/web/sites/form/web_vhost_domain.tform.php
@@ -861,7 +861,7 @@ if($_SESSION["s"]["user"]["typ"] == 'admin'
'pm' => array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
- 'default' => 'dynamic',
+ 'default' => 'ondemand',
'value' => array('static' => 'static', 'dynamic' => 'dynamic', 'ondemand' => 'ondemand (PHP Version >= 5.3.9)')
),
'pm_max_children' => array (
--
GitLab