feat: new env variable to hide the SSH port in quickcommands and wizard

#237
This commit is contained in:
Ravinou 2024-08-17 13:45:12 +02:00
commit 3587942d31
No known key found for this signature in database
GPG key ID: EEEE670C40F6A4D7
3 changed files with 8 additions and 12 deletions

View file

@ -38,6 +38,9 @@ SSH_SERVER_PORT_LAN=
# Disable the integrations (API tokens to CRUD repositories)
#NEXT_PUBLIC_DISABLE_INTEGRATIONS=true
# Hide the SSH port in the UI : quickcommands & wizard
#NEXT_PUBLIC_HIDE_SSH_PORT=true
# SMTP server settings
MAIL_SMTP_FROM=
MAIL_SMTP_HOST=

View file

@ -3,21 +3,13 @@ import React from 'react';
import { useState } from 'react';
import classes from './QuickCommands.module.css';
import { IconSettingsAutomation, IconCopy } from '@tabler/icons-react';
import lanCommandOption from '../../../helpers/functions/lanCommandOption';
export default function QuickCommands(props) {
////Vars
const wizardEnv = props.wizardEnv;
//Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled.
let FQDN;
let SSH_SERVER_PORT;
if (props.lanCommand && wizardEnv.FQDN_LAN && wizardEnv.SSH_SERVER_PORT_LAN) {
FQDN = wizardEnv.FQDN_LAN;
SSH_SERVER_PORT =
wizardEnv.SSH_SERVER_PORT_LAN === 'false' ? '' : ':' + wizardEnv.SSH_SERVER_PORT_LAN;
} else {
FQDN = wizardEnv.FQDN;
SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT === 'false' ? '' : ':' + wizardEnv.SSH_SERVER_PORT;
}
const { FQDN, SSH_SERVER_PORT } = lanCommandOption(wizardEnv, props.lanCommand);
//State
const [isCopied, setIsCopied] = useState(false);

View file

@ -4,10 +4,11 @@ export default function lanCommandOption(wizardEnv, lanCommand) {
if (lanCommand && wizardEnv.FQDN_LAN && wizardEnv.SSH_SERVER_PORT_LAN) {
FQDN = wizardEnv.FQDN_LAN;
SSH_SERVER_PORT =
wizardEnv.SSH_SERVER_PORT_LAN === 'false' ? '' : ':' + wizardEnv.SSH_SERVER_PORT_LAN;
process.env.NEXT_PUBLIC_HIDE_SSH_PORT === 'true' ? '' : ':' + wizardEnv.SSH_SERVER_PORT_LAN;
} else {
FQDN = wizardEnv.FQDN;
SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT === 'false' ? '' : ':' + wizardEnv.SSH_SERVER_PORT;
SSH_SERVER_PORT =
process.env.NEXT_PUBLIC_HIDE_SSH_PORT === 'true' ? '' : ':' + wizardEnv.SSH_SERVER_PORT;
}
return { FQDN, SSH_SERVER_PORT };