From f217d922a1247bad188a3395b744f6b54cbf3c14 Mon Sep 17 00:00:00 2001 From: Ravinou Date: Sun, 1 Oct 2023 21:15:18 +0200 Subject: [PATCH] fix: "hostname" env var is used by default in docker. Avoid conflict. --- .../Repo/QuickCommands/QuickCommands.js | 12 +++++----- .../WizardSteps/WizardStep2/WizardStep2.js | 10 ++++----- .../WizardSteps/WizardStep3/WizardStep3.js | 22 +++++++++---------- .../WizardSteps/WizardStep4/WizardStep4.js | 6 ++--- README.md | 4 ++-- helpers/functions/lanCommandOption.js | 10 ++++----- pages/api/account/getWizardEnv.js | 4 ++-- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Components/Repo/QuickCommands/QuickCommands.js b/Components/Repo/QuickCommands/QuickCommands.js index ee397a3..385e59f 100644 --- a/Components/Repo/QuickCommands/QuickCommands.js +++ b/Components/Repo/QuickCommands/QuickCommands.js @@ -8,17 +8,17 @@ 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 HOSTNAME; + let FQDN; let SSH_SERVER_PORT; if ( props.lanCommand && - wizardEnv.HOSTNAME_LAN && + wizardEnv.FQDN_LAN && wizardEnv.SSH_SERVER_PORT_LAN ) { - HOSTNAME = wizardEnv.HOSTNAME_LAN; + FQDN = wizardEnv.FQDN_LAN; SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT_LAN; } else { - HOSTNAME = wizardEnv.HOSTNAME; + FQDN = wizardEnv.FQDN; SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT; } @@ -30,7 +30,7 @@ export default function QuickCommands(props) { // Asynchronously call copy to clipboard navigator.clipboard .writeText( - `borg init -e repokey-blake2 ssh://${wizardEnv.UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.repositoryName}` + `borg init -e repokey-blake2 ssh://${wizardEnv.UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.repositoryName}` ) .then(() => { // If successful, update the isCopied state value @@ -51,7 +51,7 @@ export default function QuickCommands(props) { ) : (
borg init -e repokey-blake2 ssh://{wizardEnv.UNIX_USER}@ - {HOSTNAME}:{SSH_SERVER_PORT}/./ + {FQDN}:{SSH_SERVER_PORT}/./ {props.repositoryName}
)} diff --git a/Components/WizardSteps/WizardStep2/WizardStep2.js b/Components/WizardSteps/WizardStep2/WizardStep2.js index bac2c59..82ec20a 100644 --- a/Components/WizardSteps/WizardStep2/WizardStep2.js +++ b/Components/WizardSteps/WizardStep2/WizardStep2.js @@ -10,7 +10,7 @@ function WizardStep2(props) { const wizardEnv = props.wizardEnv; const UNIX_USER = wizardEnv.UNIX_USER; //Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled. - const { HOSTNAME, SSH_SERVER_PORT } = lanCommandOption( + const { FQDN, SSH_SERVER_PORT } = lanCommandOption( wizardEnv, props.selectedOption.lanCommand ); @@ -33,11 +33,11 @@ function WizardStep2(props) { >
borg init -e repokey-blake2 ssh:// - {UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ + {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./ {props.selectedOption.repositoryName}
@@ -88,11 +88,11 @@ function WizardStep2(props) { >
ssh:// - {UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ + {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./ {props.selectedOption.repositoryName}
For more information about the Vorta graphical client, please diff --git a/Components/WizardSteps/WizardStep3/WizardStep3.js b/Components/WizardSteps/WizardStep3/WizardStep3.js index 2220abc..cb30a5c 100644 --- a/Components/WizardSteps/WizardStep3/WizardStep3.js +++ b/Components/WizardSteps/WizardStep3/WizardStep3.js @@ -10,7 +10,7 @@ function WizardStep3(props) { const wizardEnv = props.wizardEnv; const UNIX_USER = wizardEnv.UNIX_USER; //Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled. - const { HOSTNAME, SSH_SERVER_PORT } = lanCommandOption( + const { FQDN, SSH_SERVER_PORT } = lanCommandOption( wizardEnv, props.selectedOption.lanCommand ); @@ -32,12 +32,12 @@ function WizardStep3(props) { >
borg create ssh:// - {UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ + {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./ {props.selectedOption.repositoryName} ::archive1 /your/pathToBackup
@@ -78,11 +78,11 @@ function WizardStep3(props) { >
borg check -v --progress ssh:// - {UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ + {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./ {props.selectedOption.repositoryName}
  • List the remote archives with :
    • @@ -95,11 +95,11 @@ function WizardStep3(props) { >
    borg list ssh:// - {UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ + {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./ {props.selectedOption.repositoryName}
  • Download a remote archive with the following command :
    • @@ -112,12 +112,12 @@ function WizardStep3(props) { >
    borg export-tar --tar-filter="gzip -9" ssh:// - {UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ + {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./ {props.selectedOption.repositoryName} ::archive1 archive1.tar.gz
  • @@ -133,12 +133,12 @@ function WizardStep3(props) { >
    borg mount ssh:// - {UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ + {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./ {props.selectedOption.repositoryName} ::archive1 /tmp/yourMountPoint

    diff --git a/Components/WizardSteps/WizardStep4/WizardStep4.js b/Components/WizardSteps/WizardStep4/WizardStep4.js index 85b30cb..99dcc8d 100644 --- a/Components/WizardSteps/WizardStep4/WizardStep4.js +++ b/Components/WizardSteps/WizardStep4/WizardStep4.js @@ -10,7 +10,7 @@ function WizardStep4(props) { const wizardEnv = props.wizardEnv; const UNIX_USER = wizardEnv.UNIX_USER; //Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled. - const { HOSTNAME, SSH_SERVER_PORT } = lanCommandOption( + const { FQDN, SSH_SERVER_PORT } = lanCommandOption( wizardEnv, props.selectedOption.lanCommand ); @@ -23,10 +23,10 @@ function WizardStep4(props) { repositories: # Paths of local or remote repositories to backup to. - - ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName} + - ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName} storage: - archive_name_format: '{HOSTNAME}-documents-{now}' + archive_name_format: '{FQDN}-documents-{now}' encryption_passphrase: "YOUR PASSPHRASE" retention: diff --git a/README.md b/README.md index 0139ba5..47b93c6 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Required variables : - `NEXTAUTH_SECRET` : A secret random key. - `CRONJOB_KEY` : A secret API key for cronjob. - `UNIX_USER` : The unix user that run BorgWarehouse app. -- `HOSTNAME` : FQDN as **borgwarehouse.com** +- `FQDN` : FQDN as **borgwarehouse.com** - `SSH_SERVER_PORT` : SSH port of your server as **22**. - `SSH_SERVER_FINGERPRINT_RSA` : Your server SSH fingerprint for RSA. - `SSH_SERVER_FINGERPRINT_ED25519` : Your server SSH fingerprint for ED25519. @@ -66,7 +66,7 @@ NEXTAUTH_SECRET=YOURFIRSTSECRET CRONJOB_KEY=YOURSECONDSECRET # Wizard's variables UNIX_USER=borgwarehouse -HOSTNAME=yourbwdomain.com +FQDN=yourbwdomain.com SSH_SERVER_PORT=22 SSH_SERVER_FINGERPRINT_RSA=SHA256:36mfYNRrm1aconVt6cBpi8LhAoPP4kB8QsVW4n8eGHQ SSH_SERVER_FINGERPRINT_ED25519=SHA256:tYQuzrZZMqaw0Bzvn/sMoDs1CVEitZ9IrRyUg02yTPA diff --git a/helpers/functions/lanCommandOption.js b/helpers/functions/lanCommandOption.js index c546cbb..40918e0 100644 --- a/helpers/functions/lanCommandOption.js +++ b/helpers/functions/lanCommandOption.js @@ -1,13 +1,13 @@ export default function lanCommandOption(wizardEnv, lanCommand) { - let HOSTNAME; + let FQDN; let SSH_SERVER_PORT; - if (lanCommand && wizardEnv.HOSTNAME_LAN && wizardEnv.SSH_SERVER_PORT_LAN) { - HOSTNAME = wizardEnv.HOSTNAME_LAN; + if (lanCommand && wizardEnv.FQDN_LAN && wizardEnv.SSH_SERVER_PORT_LAN) { + FQDN = wizardEnv.FQDN_LAN; SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT_LAN; } else { - HOSTNAME = wizardEnv.HOSTNAME; + FQDN = wizardEnv.FQDN; SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT; } - return { HOSTNAME, SSH_SERVER_PORT }; + return { FQDN, SSH_SERVER_PORT }; } diff --git a/pages/api/account/getWizardEnv.js b/pages/api/account/getWizardEnv.js index 1cb8ed5..8a6d618 100644 --- a/pages/api/account/getWizardEnv.js +++ b/pages/api/account/getWizardEnv.js @@ -17,9 +17,9 @@ export default async function handler(req, res) { const wizardEnv = { UNIX_USER: getEnvVariable('UNIX_USER', 'borgwarehouse'), - HOSTNAME: getEnvVariable('HOSTNAME', 'localhost'), + FQDN: getEnvVariable('FQDN', 'localhost'), SSH_SERVER_PORT: getEnvVariable('SSH_SERVER_PORT', '22'), - HOSTNAME_LAN: getEnvVariable('HOSTNAME_LAN'), + FQDN_LAN: getEnvVariable('FQDN_LAN'), SSH_SERVER_PORT_LAN: getEnvVariable('SSH_SERVER_PORT_LAN'), SSH_SERVER_FINGERPRINT_RSA: getEnvVariable( 'SSH_SERVER_FINGERPRINT_RSA'