From 69ff416361c67adca0168f0a15415c04f55e8312 Mon Sep 17 00:00:00 2001 From: Patrik Kernstock Date: Tue, 31 Dec 2019 15:34:46 +0100 Subject: [PATCH] Fixed SQL, minor comments/lng updates Signed-off-by: Patrik Kernstock --- install/froxlor.sql | 2 +- install/updates/froxlor/0.10/update_0.10.inc.php | 2 +- lib/Froxlor/Api/Commands/FpmDaemons.php | 4 ++-- lng/english.lng.php | 5 +++-- lng/german.lng.php | 3 ++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index c90463e5..e8f2abd2 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -848,7 +848,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 NOT NULL DEFAULT '', + `custom_config` text, PRIMARY KEY (`id`), UNIQUE KEY `reload` (`reload_cmd`), UNIQUE KEY `config` (`config_dir`) diff --git a/install/updates/froxlor/0.10/update_0.10.inc.php b/install/updates/froxlor/0.10/update_0.10.inc.php index 370f612c..24198de9 100644 --- a/install/updates/froxlor/0.10/update_0.10.inc.php +++ b/install/updates/froxlor/0.10/update_0.10.inc.php @@ -526,7 +526,7 @@ 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 NOT NULL DEFAULT '' AFTER `limit_extensions`;"); + Database::query("ALTER TABLE `" . TABLE_PANEL_PHPDAEMONS . "` ADD `custom_config` text AFTER `limit_extensions`;"); lastStepStatus(0); \Froxlor\Froxlor::updateToDbVersion('201912310'); } diff --git a/lib/Froxlor/Api/Commands/FpmDaemons.php b/lib/Froxlor/Api/Commands/FpmDaemons.php index 4f94e2e9..a926429a 100644 --- a/lib/Froxlor/Api/Commands/FpmDaemons.php +++ b/lib/Froxlor/Api/Commands/FpmDaemons.php @@ -151,7 +151,7 @@ class FpmDaemons extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc * @param string $limit_extensions * optional, limit execution to the following extensions, default '.php' * @param string $custom_config - * optional, custom settings appended to phpfpm configuration + * optional, custom settings appended to phpfpm pool configuration * * @access admin * @throws \Exception @@ -267,7 +267,7 @@ class FpmDaemons extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc * @param string $limit_extensions * optional, limit execution to the following extensions, default '.php' * @param string $custom_config - * optional, custom settings appended to phpfpm configuration + * optional, custom settings appended to phpfpm pool configuration * * @access admin * @throws \Exception diff --git a/lng/english.lng.php b/lng/english.lng.php index a7ec7f80..b8eb5739 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -2086,5 +2086,6 @@ $lng['admin']['domain_sslenabled'] = 'Enable usage of SSL'; $lng['admin']['domain_honorcipherorder'] = 'Honor the (server) cipher order, default no'; $lng['admin']['domain_sessiontickets'] = 'Enable TLS sessiontickets (RFC 5077), default yes'; -$lng['serversettings']['phpfpm_settings']['custom_config']['title'] = 'Custom Configuration'; -$lng['serversettings']['phpfpm_settings']['custom_config']['description'] = 'Add custom configuration to each PHP-FPM version instance, for example pm.status_path = /status for monitoring. Variables below can be used here.'; +$lng['serversettings']['phpfpm_settings']['restart_note'] = 'Attention: The config won\'t be checked for any errors. If it contains errors, PHP-FPM might not start again!'; +$lng['serversettings']['phpfpm_settings']['custom_config']['title'] = 'Custom configuration'; +$lng['serversettings']['phpfpm_settings']['custom_config']['description'] = 'Add custom configuration to each PHP-FPM version instance, for example pm.status_path = /status for monitoring. Variables below can be used here. ' . ' ' . $lng['serversettings']['phpfpm_settings']['restart_note'] . ''; diff --git a/lng/german.lng.php b/lng/german.lng.php index 92fbaf6a..b10b46db 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1733,5 +1733,6 @@ $lng['admin']['domain_sslenabled'] = 'Aktiviere Nutzung von SSL'; $lng['admin']['domain_honorcipherorder'] = 'Bevorzuge die serverseitige Cipher Reihenfolge, Standardwert nein'; $lng['admin']['domain_sessiontickets'] = 'Aktiviere TLS Sessiontickets (RFC 5077), Standardwert ja'; +$lng['serversettings']['phpfpm_settings']['restart_note'] = 'Achtung: Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!'; $lng['serversettings']['phpfpm_settings']['custom_config']['title'] = 'Benutzerdefinierte Konfiguration'; -$lng['serversettings']['phpfpm_settings']['custom_config']['description'] = 'Füge eine benutzerdefinierte Einstellungen zur PHP-FPM Instanz hinzu, beispielsweise pm.status_path = /status für Monitoring. Unten ersichtliche Variablen können verwendet werden.'; +$lng['serversettings']['phpfpm_settings']['custom_config']['description'] = 'Füge eine benutzerdefinierte Einstellungen zur PHP-FPM Instanz hinzu, beispielsweise pm.status_path = /status für Monitoring. Unten ersichtliche Variablen können verwendet werden.' . ' ' . $lng['serversettings']['phpfpm_settings']['restart_note'] . '';