maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into logformat

Browse Source
This commit is contained in:
Patrik Kernstock
2020-01-02 12:31:51 +01:00
committed by GitHub
parent 7f83ad31f4 e01c2e02fb
commit 28fd88e53e
10 changed files with 201 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install/froxlor.sql
View File

@@ -849,6 +849,7 @@ CREATE TABLE `panel_fpmdaemons` (
`max_requests` int(4) NOT NULL DEFAULT '0',
`idle_timeout` int(4) NOT NULL DEFAULT '30',
`limit_extensions` varchar(255) NOT NULL default '.php',
`custom_config` text,
PRIMARY KEY (`id`),
UNIQUE KEY `reload` (`reload_cmd`),
UNIQUE KEY `config` (`config_dir`)

7
install/updates/froxlor/0.10/update_0.10.inc.php
View File

@@ -531,6 +531,13 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201912100')) {
\Froxlor\Froxlor::updateToDbVersion('201912310');
}
if (\Froxlor\Froxlor::isDatabaseVersion('201912310')) {
showUpdateStep("Adding custom phpfpm pool configuration field");
Database::query("ALTER TABLE `" . TABLE_PANEL_FPMDAEMONS . "` ADD `custom_config` text AFTER `limit_extensions`;");
lastStepStatus(0);
\Froxlor\Froxlor::updateToDbVersion('201912311');
}
if (\Froxlor\Froxlor::isDatabaseVersion('201912311')) {
showUpdateStep("Migrate logfiles_format setting");
Settings::Set('system.logfiles_format', '"' . Settings::Get('system.logfiles_format') . '"');