From 11c488215620d12c1f79fc9b05deb9928d2cab39 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 16 Nov 2020 14:03:21 +0100 Subject: [sysconfig] SSH: Split pubkey and rest of config, add more options Now we can have exactly one SSH-Config per sysconfig, which avoids confusion due to config mismatch regarding "allow pw" and "port". The install include takes care of splitting the key into a new module for existing modules, but doesn't remove duplicate SshConfig modules from sysconfigs, as this might lead to additional confusion. Next time the user edits a sysconfig, they are forced to pick exactly one SshConfig module. The "allow password login" option was extended to allow password login for non-root users only in addition to simply being "yes" or "no". There's an additional option that can entirely limit the group of users allowed to log in via SSH. --- .../sysconfig/lang/en/template-tags.json | 32 +++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'modules-available/sysconfig/lang/en/template-tags.json') diff --git a/modules-available/sysconfig/lang/en/template-tags.json b/modules-available/sysconfig/lang/en/template-tags.json index 40484b5a..89f6886b 100644 --- a/modules-available/sysconfig/lang/en/template-tags.json +++ b/modules-available/sysconfig/lang/en/template-tags.json @@ -8,8 +8,6 @@ "lang_adText3": "Next the distinguished name of the user must be specified. You can determine this by dsquery command line program on a domain controller as the following call:", "lang_adText4": "After entering all required data in the next step, it checks whether communication is possible with the AD.", "lang_add": "Add", - "lang_allowPass": "Allow password login", - "lang_allowPassInfo": "When active, logins via username and password are allowed. Otherwise, only pubkey authentication is possible.", "lang_asteriskMandatory": "Fields marked with (*) are mandatory", "lang_availableModules": "Available Configuration Modules", "lang_availableSystem": "Available System Configuration", @@ -74,10 +72,10 @@ "lang_mapModeNativeFallback": "Natively map inside VM; fallback to VMware Shared Folders", "lang_mapModeNone": "Don't map shares at all", "lang_mapModeVmware": "VMware Shared Folders [VMwareTools]", + "lang_modStillUsedBy": "Module still in use by:", "lang_mode": "Mode", - "lang_modeEasy": "Easy Mode", "lang_modeAdvanced": "Advanced Mode", - "lang_modStillUsedBy": "Module still in use by:", + "lang_modeEasy": "Easy Mode", "lang_moduleChoose": "Please select which type of configuration module you want to create.", "lang_moduleConfiguration": "Module Configuration", "lang_moduleName": "Module Name", @@ -95,6 +93,7 @@ "lang_noValidCert": "The server did not supply a certificate, or the certificate is invalid.", "lang_onProblemSearchBase": "If no users are found, please check the search base", "lang_or": "or", + "lang_pwlogin_user_only": "Everyone except root", "lang_rebuild": "Rebuild", "lang_rebuildLong": "Rebuild module or configuration.", "lang_rebuildOutdatedLong": "Rebuild module or configuration. The module\/configuration is outdated or missing and should be regenerated.", @@ -102,11 +101,11 @@ "lang_replaces": "Replaces module: ", "lang_restartWizard": "Restart wizard", "lang_rootKey": "root pubkey", - "lang_rootKeyInfo": "Here you can add the public key of a keypair that you want to use for authentication as root-user. Leave this field blank to disable the feature.", + "lang_rootKeyInfo": "Here you can add the public key of a keypair that you want to use for authentication as root-user.", "lang_screenBackground": "Background", "lang_screenBackgroundDescription": " - A background consisting of a gradient with two colors.", - "lang_screenColor": "Color", "lang_screenClock": "Clock", + "lang_screenColor": "Color", "lang_screenDescriptionIdleKill": "A screensaver with a timeout which on it's expiration will close all running applications without further requests and logout the user.", "lang_screenDescriptionNoTimeout": "A screensaver without a timeout.", "lang_screenDescriptionShutdown": "A screensaver with a timeout which on it's expiration the PC will shutdown or restart. All applications will be closed without further requests.", @@ -120,16 +119,16 @@ "lang_screenMessageDefaultShutdown": "Caution: Computer will shutdown in %1!", "lang_screenMessageDefaultShutdownLocked": "Caution: Computer will shutdown in %1!", "lang_screenQss": "QSS", - "lang_screenQssDefault": "#Saver {\n background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #443, stop:1 #000)\n}\n\nQLabel {\n color: #f64;\n}\n\n#lblClock {\n color: #999;\n font-size: 20pt;\n}\n\n#lblHeader {\n font-size: 20pt;\n}\n", + "lang_screenQssDefault": "#Saver {\r\n background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #443, stop:1 #000)\r\n}\r\n\r\nQLabel {\r\n color: #f64;\r\n}\r\n\r\n#lblClock {\r\n color: #999;\r\n font-size: 20pt;\r\n}\r\n\r\n#lblHeader {\r\n font-size: 20pt;\r\n}\r\n", "lang_screenSize": "Size", + "lang_screenText": "Edit Contenttext", + "lang_screenTextDefaultIdleKill": "
No user activity detected.