[webinterface] Remove the 'off' option for HTTPS

As we always use a self-signed certificate for client communication, you
cannot really turn off HTTPS, and explicitly generating another
self-signed certificate for slx-admin is rather pointless. So
internally, we actually remove the option for a self-signed certificate,
and rename the "off" option to using a self-signed one.

2 files changed, 3 insertions, 6 deletions

diff --git a/modules-available/webinterface/lang/en/messages.json b/modules-available/webinterface/lang/en/messages.json
index edccbd47..f938552a 100644
--- a/modules-available/webinterface/lang/en/messages.json
+++ b/modules-available/webinterface/lang/en/messages.json
@@ -4,8 +4,6 @@
     "acme-no-mail": "No technical mail contact specified",
     "acme-no-provider": "No ACME provider selected",
     "https-on-cert-missing": "HTTPS is enabled, but the certificate is missing. Please redo the configuration steps.",
-    "https-used-without-cert": "HTTPS is currently used, but there is no certificate installed. If you tweaked the web server's configuration manually to enable HTTPS bear in mind that a future server update might overwrite your modified configuration without asking.",
-    "https-want-off-is-used": "HTTPS is currently in use although it is disabled in the settings. Very weird indeed.",
     "https-want-redirect-is-plain": "HTTP to HTTPS redirects are enabled, but the connection from your browser appears to be unencrypted. Please redo the HTTPS configuration and contact support if the problem persists.",
     "invalid-domain": "Invalid domain: {{0}}",
     "mw-acme-errors": "Error renewing\/requesting certificate via ACME"
diff --git a/modules-available/webinterface/lang/en/template-tags.json b/modules-available/webinterface/lang/en/template-tags.json
index 9c290083..b3afb43f 100644
--- a/modules-available/webinterface/lang/en/template-tags.json
+++ b/modules-available/webinterface/lang/en/template-tags.json
@@ -9,6 +9,7 @@
     "lang_acmeSelected": "Current certificate was generated via ACME.",
     "lang_acmeWipeAll": "Wipe all existing data and request everything anew",
     "lang_acmeWipeAllHint": "Select this option if you experience trouble renewing an existing certificate, or if a previous registration attempt left stale data. Please be aware that rate limits apply with some providers, so you shouldn't issue too many requests over a short period of time.",
+    "lang_apiSelected": "Current certificate was supplied via API access.",
     "lang_applyingSettings": "Applying settings",
     "lang_caChain": "Here you can paste an optional certificate chain. It should only be required if you have a certificate that was not directly signed by a certificate authority known by the browsers. It should contain one or more certificate blocks, looking just like the certificate above.",
     "lang_certExpireTime": "Certificate expires",
@@ -32,20 +33,18 @@
     "lang_httpsCurrentApiKey": "Current token",
     "lang_httpsDescription": "Here you can set whether the web interface should be accessible via https. You can choose if you want to use a random self signed certificate, or supply your own.",
     "lang_httpsOptionNoChange": "Don't change",
-    "lang_httpsRedirect": "Redirect incoming HTTP requests to HTTPS (if enabled).",
+    "lang_httpsRedirect": "Redirect incoming HTTP requests to HTTPS",
     "lang_httpsSettings": "HTTPS settings",
     "lang_installAndRestart": "Installing certificate and restarting web server",
     "lang_logoBackground": "Logo background color",
     "lang_moduleHeading": "Web Interface",
     "lang_msgAcmeFailed": "ACME failed",
-    "lang_noHttps": "Disable HTTPS, delete current certificate",
-    "lang_offSelected": "HTTPS is currently disabled.",
+    "lang_noHttps": "Delete current certificate, only use internal self-signed certificate",
     "lang_optionAcme": "ACMEv2",
     "lang_pageTitlePrefix": "Page title prefix",
     "lang_passwordFields": "Password fields",
     "lang_passwordsDescription": "Set whether password fields should be masked or not. The password field of the login page to the web interface is always masked.",
     "lang_privateKey": "Please paste the private key belonging to the certificate here. It has to be in \"pem\" format too, which should look like this:",
-    "lang_randomCert": "Generate new self-signed certificate",
     "lang_redirectDomain": "Redirect browser to certificate's primary domain if accessed via unknown domain name or IP address",
     "lang_regenerate": "(Re)generate",
     "lang_showPasswords": "Show passwords",