From efd64300c4e4aea057c5b8908460e8c18350d6b7 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 8 Mar 2016 14:50:31 +0100 Subject: [PATCH] clearify that a special config is needed for LE in the webserver Signed-off-by: Michael Kaufmann (d00p) --- install/updates/preconfig/0.9/preconfig_0.9.inc.php | 2 +- lng/english.lng.php | 2 +- lng/german.lng.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index 8a0f05d8..28613aba 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -703,7 +703,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c if (versionInUpdate($current_db_version, '201603070')) { $has_preconfig = true; - $description = 'You can chose whether you want to enable or disable our Let\'s Encrypt implementation.

'; + $description = 'You can chose whether you want to enable or disable our Let\'s Encrypt implementation.
Please remember that you need to go through the webserver-configuration when enabled because this feature needs a special configuration.

'; $question = 'Do you want to enable Let\'s Encrypt? (default: yes): '; $question.= makeyesno('enable_letsencrypt', '1', '0', '1').'
'; eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); diff --git a/lng/english.lng.php b/lng/english.lng.php index 6754409f..5bff4ea7 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1952,7 +1952,7 @@ $lng['serversettings']['letsencryptkeysize']['description'] = "Size of the key i $lng['serversettings']['letsencryptreuseold']['title'] = "Re-use Let's Encrypt key / CSR"; $lng['serversettings']['letsencryptreuseold']['description'] = "If activated, the same key and CSR will be used for every renew, otherwise a new key / CSR will be generated every time.
ATTENTION: Let's Encrypt is still in beta"; $lng['serversettings']['leenabled']['title'] = "Enable Let's Encrypt"; -$lng['serversettings']['leenabled']['description'] = "If activated, customers are able to let froxlor automatically generate and renew Let's Encrypt ssl-certificates for domains with a ssl IP/port."; +$lng['serversettings']['leenabled']['description'] = "If activated, customers are able to let froxlor automatically generate and renew Let's Encrypt ssl-certificates for domains with a ssl IP/port.

Please remember that you need to go through the webserver-configuration when eabled because this feature needs a special configuration."; $lng['domains']['ssl_redirect_temporarilydisabled'] = "
The SSL redirect is temporarily deactivated while a new Let's Encrypt certificate is generated. It will be activated again after the certificate was generated."; // Autoupdate diff --git a/lng/german.lng.php b/lng/german.lng.php index 35372cee..2dedae53 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1606,7 +1606,7 @@ $lng['serversettings']['letsencryptkeysize']['description'] = "Größe des Schl $lng['serversettings']['letsencryptreuseold']['title'] = "Let's Encrypt Schlüssel / CSR wiederverwenden"; $lng['serversettings']['letsencryptreuseold']['description'] = "Wenn dies aktiviert ist, werden der alte Schlüssel und CSR bei jeder Verlängerung verwendet, andernfalls wird ein neues Paar generiert.
ACHTUNG: Let's Encrypt befindet sich noch im Test"; $lng['serversettings']['leenabled']['title'] = "Let's Encrypt verwenden"; -$lng['serversettings']['leenabled']['description'] = "Wenn dies aktiviert ist, können Kunden durch Froxlor automatisch generierte und verlängerbare Let's Encrypt SSL-Zertifikate für Domains mit SSL IP/port nutzen."; +$lng['serversettings']['leenabled']['description'] = "Wenn dies aktiviert ist, können Kunden durch Froxlor automatisch generierte und verlängerbare Let's Encrypt SSL-Zertifikate für Domains mit SSL IP/port nutzen.

Bitte die Webserver-Konfiguration beachten wenn aktiviert, da dieses Feature eine spezielle Konfiguration benötigt."; $lng['domains']['ssl_redirect_temporarilydisabled'] = "
Die SSL-Umleitung ist, während ein neues Let's Encrypt - Zertifikat erstellt wird, temporär deaktiviert. Die Umleitung wird nach der Zertifikatserstellung wieder aktiviert."; // Added for Termination-date