Merge branch 'master' into phpfpm-custom-settings

This commit is contained in:
Patrik Kernstock
2019-12-31 15:51:27 +01:00
committed by GitHub
11 changed files with 276 additions and 181 deletions

View File

@@ -657,6 +657,7 @@ opcache.interned_strings_buffer'),
('system', 'tlsv13_cipher_list', ''),
('system', 'honorcipherorder', '0'),
('system', 'sessiontickets', '1'),
('system', 'sessionticketsenabled', '1'),
('system', 'logfiles_format', ''),
('system', 'logfiles_type', '1'),
('system', 'logfiles_piped', '0'),
@@ -702,7 +703,7 @@ opcache.interned_strings_buffer'),
('panel', 'customer_hide_options', ''),
('panel', 'is_configured', '0'),
('panel', 'version', '0.10.10'),
('panel', 'db_version', '201912100');
('panel', 'db_version', '201912310');
DROP TABLE IF EXISTS `panel_tasks`;

View File

@@ -527,6 +527,8 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.10.9')) {
if (\Froxlor\Froxlor::isDatabaseVersion('201912100')) {
showUpdateStep("Adding custom phpfpm configuration field");
Database::query("ALTER TABLE `" . TABLE_PANEL_PHPDAEMONS . "` ADD `custom_config` text AFTER `limit_extensions`;");
showUpdateStep("Adding option to disable SSL sessiontickets for older systems");
Settings::AddNew("system.sessionticketsenabled", '1');
lastStepStatus(0);
\Froxlor\Froxlor::updateToDbVersion('201912310');
}