diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 351510b0..451880e5 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -3023,8 +3023,8 @@ if (isFroxlorVersion('0.9.34.1')) { if (isFroxlorVersion('0.9.34.2')) { - showUpdateStep("Updating from 0.9.34.2 to 0.9.35-dev1"); - lastStepStatus(0); + showUpdateStep("Updating from 0.9.34.2 to 0.9.35-dev1", false); + showUpdateStep("Adding Let's Encrypt - certificate fields"); Database::query("ALTER TABLE `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` ADD `expirationdate` DATETIME NULL AFTER `ssl_cert_chainfile`;"); Database::query("ALTER TABLE `".TABLE_PANEL_CUSTOMERS."` ADD `lepublickey` MEDIUMTEXT DEFAULT NULL AFTER `custom_notes_show`"); @@ -3050,8 +3050,8 @@ if (isFroxlorVersion('0.9.34.2')) { if (isFroxlorVersion('0.9.35-dev1')) { - showUpdateStep("Updating from 0.9.35-dev1 to 0.9.35-dev2"); - lastStepStatus(0); + showUpdateStep("Updating from 0.9.35-dev1 to 0.9.35-dev2", false); + showUpdateStep("Adding Let's Encrypt - settings"); Settings::AddNew("system.letsencryptca", 'testing'); Settings::AddNew("system.letsencryptcountrycode", 'DE'); @@ -3063,7 +3063,9 @@ if (isFroxlorVersion('0.9.35-dev1')) { if (isFroxlorVersion('0.9.35-dev2')) { - showUpdateStep("Updating from 0.9.35-dev2 to 0.9.35-dev3"); + showUpdateStep("Updating from 0.9.35-dev2 to 0.9.35-dev3", false); + + showUpdateStep("Adding new domain fields for Let's Encrypt"); Database::query("ALTER TABLE `".TABLE_PANEL_DOMAINS."` ADD `termination_date` date NOT NULL AFTER `registration_date`"); lastStepStatus(0); @@ -3072,7 +3074,9 @@ if (isFroxlorVersion('0.9.35-dev2')) { if (isFroxlorVersion('0.9.35-dev3')) { - // remove unused settingjj + showUpdateStep("Updating from 0.9.35-dev3 to 0.9.35-dev4", false); + + // remove unused setting showUpdateStep("Removing unused setting "Send cron-errors to froxlor-admin via e-mail""); Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'send_cron_errors';"); lastStepStatus(0); @@ -3083,6 +3087,8 @@ if (isFroxlorVersion('0.9.35-dev3')) { if (isFroxlorVersion('0.9.35-dev4')) { + showUpdateStep("Updating from 0.9.35-dev4 to 0.9.35-dev5", false); + showUpdateStep("Adding more Let's Encrypt settings"); Settings::AddNew("system.letsencryptchallengepath", FROXLOR_INSTALL_DIR); Settings::AddNew("system.letsencryptkeysize", '4096'); diff --git a/lng/english.lng.php b/lng/english.lng.php index 589f3776..7a430ed4 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -336,7 +336,7 @@ $lng['serversettings']['documentroot_prefix']['description'] = 'Where should all $lng['serversettings']['logfiles_directory']['title'] = 'Logfiles directory'; $lng['serversettings']['logfiles_directory']['description'] = 'Where should all log files be stored?'; $lng['serversettings']['ipaddress']['title'] = 'IP-address'; -$lng['serversettings']['ipaddress']['description'] = 'What\'s the IP-address of this server?'; +$lng['serversettings']['ipaddress']['description'] = 'What\'s the main IP-address of this server?'; $lng['serversettings']['hostname']['title'] = 'Hostname'; $lng['serversettings']['hostname']['description'] = 'What\'s the Hostname of this server?'; $lng['serversettings']['apachereload_command']['title'] = 'Webserver reload command'; @@ -435,7 +435,7 @@ $lng['error']['webmailiswrong'] = 'The webmail-link is not a valid link.'; $lng['error']['webftpiswrong'] = 'The WebFTP-link is not a valid link.'; $lng['domains']['hasaliasdomains'] = 'Has alias domain(s)'; $lng['serversettings']['defaultip']['title'] = 'Default IP/Port'; -$lng['serversettings']['defaultip']['description'] = 'What\'s the default IP/Port combination?'; +$lng['serversettings']['defaultip']['description'] = 'Select all IP-addresses you want to use as default for new domains'; $lng['domains']['statstics'] = 'Usage Statistics'; $lng['panel']['ascending'] = 'ascending'; $lng['panel']['decending'] = 'decending'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 0a0523ca..a6bba734 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -334,7 +334,7 @@ $lng['serversettings']['documentroot_prefix']['description'] = 'Wo sollen die He $lng['serversettings']['logfiles_directory']['title'] = 'Webserver-Logdateien-Verzeichnis'; $lng['serversettings']['logfiles_directory']['description'] = 'Wo sollen die Logdateien des Webservers liegen?'; $lng['serversettings']['ipaddress']['title'] = 'IP-Adresse'; -$lng['serversettings']['ipaddress']['description'] = 'Welche IP-Adresse hat der Server?'; +$lng['serversettings']['ipaddress']['description'] = 'Welche Haupt-IP-Adresse hat der Server?'; $lng['serversettings']['hostname']['title'] = 'Hostname'; $lng['serversettings']['hostname']['description'] = 'Welchen Hostnamen hat der Server?'; $lng['serversettings']['apachereload_command']['title'] = 'Webserver-Reload-Command'; @@ -432,7 +432,7 @@ $lng['error']['webmailiswrong'] = 'Die "Webmail-URL" ist keine gültige URL.'; $lng['error']['webftpiswrong'] = 'Die "WebFTP-URL" ist keine gültige URL.'; $lng['domains']['hasaliasdomains'] = 'Hat Aliasdomain(s)'; $lng['serversettings']['defaultip']['title'] = 'Standard-IP/Port'; -$lng['serversettings']['defaultip']['description'] = 'Welche IP/Port-Kombination soll standardmäßig verwendet werden?'; +$lng['serversettings']['defaultip']['description'] = 'Welche IP/Port-Kombination sollen standardmäßig verwendet werden?'; $lng['domains']['statstics'] = 'Statistiken'; $lng['panel']['ascending'] = 'aufsteigend'; $lng['panel']['decending'] = 'absteigend';