deblan-mirror/borgwarehouse
deblan-mirror/borgwarehouse
1
0
Fork 0
mirror of https://github.com/Ravinou/borgwarehouse synced 2024-06-04 15:02:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: "hostname" env var is used by default in docker. Avoid conflict.

Browse source
This commit is contained in:
Ravinou 2023-10-01 21:15:18 +02:00
parent 2ff969d3c1
commit f217d922a1
No known key found for this signature in database
GPG key ID: EEEE670C40F6A4D7
7 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Components/Repo/QuickCommands/QuickCommands.js
View file

@ -8,17 +8,17 @@ export default function QuickCommands(props) {
////Vars ////Vars
const wizardEnv = props.wizardEnv; const wizardEnv = props.wizardEnv;
//Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled. //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; let SSH_SERVER_PORT;
if ( if (
props.lanCommand && props.lanCommand &&
wizardEnv.HOSTNAME_LAN && wizardEnv.FQDN_LAN &&
wizardEnv.SSH_SERVER_PORT_LAN wizardEnv.SSH_SERVER_PORT_LAN
) { ) {
HOSTNAME = wizardEnv.HOSTNAME_LAN; FQDN = wizardEnv.FQDN_LAN;
SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT_LAN; SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT_LAN;
} else { } else {
HOSTNAME = wizardEnv.HOSTNAME; FQDN = wizardEnv.FQDN;
SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT; SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT;
} }
@ -30,7 +30,7 @@ export default function QuickCommands(props) {
// Asynchronously call copy to clipboard // Asynchronously call copy to clipboard
navigator.clipboard navigator.clipboard
.writeText( .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(() => { .then(() => {
// If successful, update the isCopied state value // If successful, update the isCopied state value
@ -51,7 +51,7 @@ export default function QuickCommands(props) {
) : ( ) : (
<div className={classes.tooltip}> <div className={classes.tooltip}>
borg init -e repokey-blake2 ssh://{wizardEnv.UNIX_USER}@ borg init -e repokey-blake2 ssh://{wizardEnv.UNIX_USER}@
{HOSTNAME}:{SSH_SERVER_PORT}/./ {FQDN}:{SSH_SERVER_PORT}/./
{props.repositoryName} {props.repositoryName}
</div> </div>
)} )}

10
Components/WizardSteps/WizardStep2/WizardStep2.js
View file

@ -10,7 +10,7 @@ function WizardStep2(props) {
const wizardEnv = props.wizardEnv; const wizardEnv = props.wizardEnv;
const UNIX_USER = wizardEnv.UNIX_USER; 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. //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, wizardEnv,
props.selectedOption.lanCommand props.selectedOption.lanCommand
); );
@ -33,11 +33,11 @@ function WizardStep2(props) {
> >
<div className={classes.code}> <div className={classes.code}>
borg init -e repokey-blake2 ssh:// borg init -e repokey-blake2 ssh://
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
{props.selectedOption.repositoryName} {props.selectedOption.repositoryName}
</div> </div>
<CopyButton <CopyButton
dataToCopy={`borg init -e repokey-blake2 ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`} dataToCopy={`borg init -e repokey-blake2 ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
/> />
</div> </div>
<div className={classes.note}> <div className={classes.note}>
@ -88,11 +88,11 @@ function WizardStep2(props) {
> >
<div className={classes.code}> <div className={classes.code}>
ssh:// ssh://
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
{props.selectedOption.repositoryName} {props.selectedOption.repositoryName}
</div> </div>
<CopyButton <CopyButton
dataToCopy={`ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`} dataToCopy={`ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
/> />
</div> </div>
For more information about the Vorta graphical client, please For more information about the Vorta graphical client, please

22
Components/WizardSteps/WizardStep3/WizardStep3.js
View file

@ -10,7 +10,7 @@ function WizardStep3(props) {
const wizardEnv = props.wizardEnv; const wizardEnv = props.wizardEnv;
const UNIX_USER = wizardEnv.UNIX_USER; 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. //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, wizardEnv,
props.selectedOption.lanCommand props.selectedOption.lanCommand
); );
@ -32,12 +32,12 @@ function WizardStep3(props) {
> >
<div className={classes.code}> <div className={classes.code}>
borg create ssh:// borg create ssh://
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
{props.selectedOption.repositoryName} {props.selectedOption.repositoryName}
::archive1 /your/pathToBackup ::archive1 /your/pathToBackup
</div> </div>
<CopyButton <CopyButton
dataToCopy={`borg create ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /your/pathToBackup`} dataToCopy={`borg create ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /your/pathToBackup`}
/> />
</div> </div>
</div> </div>
@ -78,11 +78,11 @@ function WizardStep3(props) {
> >
<div className={classes.code}> <div className={classes.code}>
borg check -v --progress ssh:// borg check -v --progress ssh://
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
{props.selectedOption.repositoryName} {props.selectedOption.repositoryName}
</div> </div>
<CopyButton <CopyButton
dataToCopy={`borg check -v --progress ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`} dataToCopy={`borg check -v --progress ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
/> />
</div> </div>
<li>List the remote archives with :</li> <li>List the remote archives with :</li>
@ -95,11 +95,11 @@ function WizardStep3(props) {
> >
<div className={classes.code}> <div className={classes.code}>
borg list ssh:// borg list ssh://
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
{props.selectedOption.repositoryName} {props.selectedOption.repositoryName}
</div> </div>
<CopyButton <CopyButton
dataToCopy={`borg list ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`} dataToCopy={`borg list ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
/> />
</div> </div>
<li>Download a remote archive with the following command :</li> <li>Download a remote archive with the following command :</li>
@ -112,12 +112,12 @@ function WizardStep3(props) {
> >
<div className={classes.code}> <div className={classes.code}>
borg export-tar --tar-filter="gzip -9" ssh:// borg export-tar --tar-filter="gzip -9" ssh://
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
{props.selectedOption.repositoryName} {props.selectedOption.repositoryName}
::archive1 archive1.tar.gz ::archive1 archive1.tar.gz
</div> </div>
<CopyButton <CopyButton
dataToCopy={`borg export-tar --tar-filter="gzip -9" ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 archive1.tar.gz`} dataToCopy={`borg export-tar --tar-filter="gzip -9" ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 archive1.tar.gz`}
/> />
</div> </div>
<li> <li>
@ -133,12 +133,12 @@ function WizardStep3(props) {
> >
<div className={classes.code}> <div className={classes.code}>
borg mount ssh:// borg mount ssh://
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./ {UNIX_USER}@{FQDN}:{SSH_SERVER_PORT}/./
{props.selectedOption.repositoryName} {props.selectedOption.repositoryName}
::archive1 /tmp/yourMountPoint ::archive1 /tmp/yourMountPoint
</div> </div>
<CopyButton <CopyButton
dataToCopy={`borg mount ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /tmp/yourMountPoint`} dataToCopy={`borg mount ssh://${UNIX_USER}@${FQDN}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /tmp/yourMountPoint`}
/> />
</div> </div>
<br /> <br />

6
Components/WizardSteps/WizardStep4/WizardStep4.js
View file

@ -10,7 +10,7 @@ function WizardStep4(props) {
const wizardEnv = props.wizardEnv; const wizardEnv = props.wizardEnv;
const UNIX_USER = wizardEnv.UNIX_USER; 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. //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, wizardEnv,
props.selectedOption.lanCommand props.selectedOption.lanCommand
); );
@ -23,10 +23,10 @@ function WizardStep4(props) {
repositories: repositories:
# Paths of local or remote repositories to backup to. # 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: storage:
archive_name_format: '{HOSTNAME}-documents-{now}' archive_name_format: '{FQDN}-documents-{now}'
encryption_passphrase: "YOUR PASSPHRASE" encryption_passphrase: "YOUR PASSPHRASE"
retention: retention:

4
README.md
View file

@ -51,7 +51,7 @@ Required variables :
- `NEXTAUTH_SECRET` : A secret random key. - `NEXTAUTH_SECRET` : A secret random key.
- `CRONJOB_KEY` : A secret API key for cronjob. - `CRONJOB_KEY` : A secret API key for cronjob.
- `UNIX_USER` : The unix user that run BorgWarehouse app. - `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_PORT` : SSH port of your server as **22**.
- `SSH_SERVER_FINGERPRINT_RSA` : Your server SSH fingerprint for RSA. - `SSH_SERVER_FINGERPRINT_RSA` : Your server SSH fingerprint for RSA.
- `SSH_SERVER_FINGERPRINT_ED25519` : Your server SSH fingerprint for ED25519. - `SSH_SERVER_FINGERPRINT_ED25519` : Your server SSH fingerprint for ED25519.
@ -66,7 +66,7 @@ NEXTAUTH_SECRET=YOURFIRSTSECRET
CRONJOB_KEY=YOURSECONDSECRET CRONJOB_KEY=YOURSECONDSECRET
# Wizard's variables # Wizard's variables
UNIX_USER=borgwarehouse UNIX_USER=borgwarehouse
HOSTNAME=yourbwdomain.com FQDN=yourbwdomain.com
SSH_SERVER_PORT=22 SSH_SERVER_PORT=22
SSH_SERVER_FINGERPRINT_RSA=SHA256:36mfYNRrm1aconVt6cBpi8LhAoPP4kB8QsVW4n8eGHQ SSH_SERVER_FINGERPRINT_RSA=SHA256:36mfYNRrm1aconVt6cBpi8LhAoPP4kB8QsVW4n8eGHQ
SSH_SERVER_FINGERPRINT_ED25519=SHA256:tYQuzrZZMqaw0Bzvn/sMoDs1CVEitZ9IrRyUg02yTPA SSH_SERVER_FINGERPRINT_ED25519=SHA256:tYQuzrZZMqaw0Bzvn/sMoDs1CVEitZ9IrRyUg02yTPA

10
helpers/functions/lanCommandOption.js
View file

@ -1,13 +1,13 @@
export default function lanCommandOption(wizardEnv, lanCommand) { export default function lanCommandOption(wizardEnv, lanCommand) {
let HOSTNAME; let FQDN;
let SSH_SERVER_PORT; let SSH_SERVER_PORT;
if (lanCommand && wizardEnv.HOSTNAME_LAN && wizardEnv.SSH_SERVER_PORT_LAN) { if (lanCommand && wizardEnv.FQDN_LAN && wizardEnv.SSH_SERVER_PORT_LAN) {
HOSTNAME = wizardEnv.HOSTNAME_LAN; FQDN = wizardEnv.FQDN_LAN;
SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT_LAN; SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT_LAN;
} else { } else {
HOSTNAME = wizardEnv.HOSTNAME; FQDN = wizardEnv.FQDN;
SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT; SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT;
} }
return { HOSTNAME, SSH_SERVER_PORT }; return { FQDN, SSH_SERVER_PORT };
} }

4
pages/api/account/getWizardEnv.js
View file

@ -17,9 +17,9 @@ export default async function handler(req, res) {
const wizardEnv = { const wizardEnv = {
UNIX_USER: getEnvVariable('UNIX_USER', 'borgwarehouse'), UNIX_USER: getEnvVariable('UNIX_USER', 'borgwarehouse'),
HOSTNAME: getEnvVariable('HOSTNAME', 'localhost'), FQDN: getEnvVariable('FQDN', 'localhost'),
SSH_SERVER_PORT: getEnvVariable('SSH_SERVER_PORT', '22'), 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_PORT_LAN: getEnvVariable('SSH_SERVER_PORT_LAN'),
SSH_SERVER_FINGERPRINT_RSA: getEnvVariable( SSH_SERVER_FINGERPRINT_RSA: getEnvVariable(
'SSH_SERVER_FINGERPRINT_RSA' 'SSH_SERVER_FINGERPRINT_RSA'