From c09670cc45e491d8a85a9cd605d4fcea62e80d44 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 23 Apr 2023 11:56:20 +0200 Subject: [PATCH] make it clearer that the finishing commands have to be exectuted as 'root'; fixes #1128 Signed-off-by: Michael Kaufmann --- install/updates/froxlor/update_2.x.inc.php | 2 +- lng/de.lng.php | 5 +++-- lng/en.lng.php | 7 ++++--- templates/Froxlor/install/index.html.twig | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php index 8f2ff7e9..20daf7b7 100644 --- a/install/updates/froxlor/update_2.x.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -82,7 +82,7 @@ if (Froxlor::isFroxlorVersion('0.10.38.3')) { Database::query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` DROP COLUMN `domains_see_all`;"); Update::lastStepStatus(0); - Update::showUpdateStep("Checking for multiple mysql-servers to allow acccess to customers for existing databases"); + Update::showUpdateStep("Checking for multiple mysql-servers to allow access to customers for existing databases"); $dbservers_stmt = Database::query(" SELECT `customerid`, GROUP_CONCAT(DISTINCT `dbserver` SEPARATOR ',') as allowed_mysqlserver diff --git a/lng/de.lng.php b/lng/de.lng.php index febf45f0..8af35ceb 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -2179,6 +2179,7 @@ Vielen Dank, Ihr Administrator', 'description' => 'Aktualisierung der froxlor Datenbank', 'uc_newinfo' => 'Eine neuere %sVersion ist verfügbar: "%s" (Aktuell installierte Version: %s)', 'notify_subject' => 'Neues Update verfügbar', + 'dbupdate_required' => 'Froxlor-Dateien wurden aktualisiert, Datenbank-Aktualisierung notwendig', ], 'usersettings' => [ 'custom_notes' => [ @@ -2233,8 +2234,8 @@ Vielen Dank, Ihr Administrator', 'install' => [ 'top' => 'Abschluss', 'title' => 'Ein letzter Schritt...', - 'description' => 'Der untenstehende Befehl lädt, installiert und konfiguriert die benötigten Dienste auf dem System aufgrund der Angaben die während des Installationsprozessen gesammelt wurden.', - 'runcmd' => 'Folgenden Befehl als root-Benutzer in der Shell auf dem Server ausführen:', + 'description' => 'Der untenstehende Befehl lädt, installiert und konfiguriert die benötigten Dienste auf dem System aufgrund der Angaben die während des Installationsprozessen gesammelt wurden.

Führe die gezeigten Befehle als root in der Shell/Konsole des Servers aus.', + 'runcmd' => 'Folgende Befehle ausführen, um die Installation abzuschließen:', 'manual_config' => 'Ich werden die Dienste manuell konfigurieren, direkt zum Login umleiten', 'waitforconfig' => 'Warte auf Abschluss der Dienstkonfiguration...', ], diff --git a/lng/en.lng.php b/lng/en.lng.php index 090660d7..47e7f6b4 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -952,7 +952,7 @@ return [ 'autoupdate_1' => 'PHP setting allow_url_fopen is disabled. Autoupdate needs this setting to be enabled in php.ini', 'autoupdate_2' => 'PHP zip extension not found, please ensure it is installed and activated', 'autoupdate_4' => 'The froxlor archive could not be stored to the disk :(', - 'autoupdate_5' => 'version.froxlor.org returned inacceptable values :(', + 'autoupdate_5' => 'version.froxlor.org returned unacceptable values :(', 'autoupdate_6' => 'Whoops, there was no (valid) version given to download :(', 'autoupdate_7' => 'The downloaded archive could not be found :(', 'autoupdate_8' => 'The archive could not be extracted :(', @@ -2310,6 +2310,7 @@ Yours sincerely, your administrator', 'description' => 'Running database updates for your froxlor installation', 'uc_newinfo' => 'There is a newer %sversion available: "%s" (Your current version is: %s)', 'notify_subject' => 'New update available', + 'dbupdate_required' => 'Froxlor files have been updated, database update required', ], 'usersettings' => [ 'custom_notes' => [ @@ -2365,8 +2366,8 @@ Yours sincerely, your administrator', 'install' => [ 'top' => 'Finish setup', 'title' => 'One last step...', - 'description' => 'The command below will download, install and configure required services on your system according to the data you have given in this installation process.', - 'runcmd' => 'Run the following command as root-user in your shell on this server:', + 'description' => 'The command below will download, install and configure required services on your system according to the data you have given in this installation process.

Be sure to run the following command as root on the server\'s shell/terminal.', + 'runcmd' => 'Run the following command to finish the installation:', 'manual_config' => 'I will manually configure the services, just take me to the login', 'waitforconfig' => 'Waiting for services to be configured...', ], diff --git a/templates/Froxlor/install/index.html.twig b/templates/Froxlor/install/index.html.twig index 913d6269..7b5ab018 100644 --- a/templates/Froxlor/install/index.html.twig +++ b/templates/Froxlor/install/index.html.twig @@ -42,7 +42,7 @@ -

{{ section.description }}

+

{{ section.description|raw }}

{% import "Froxlor/form/formfields.html.twig" as formfields %}