mirror of
https://github.com/Ravinou/borgwarehouse
synced 2026-03-14 14:25:46 +01:00
feat: unixUser is now unique and retrieved by env
This commit is contained in:
bsourisse
Ravinou
parent
a7beb7b37f
commit
a735144a55
12 changed files with 28 additions and 36 deletions
|
|
@ -9,6 +9,7 @@ export default function QuickCommands(props) {
|
|||
//Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled.
|
||||
let HOSTNAME;
|
||||
let SSH_SERVER_PORT;
|
||||
let UNIX_USER = process.env.NEXT_PUBLIC_UNIX_USER;
|
||||
if (
|
||||
props.lanCommand &&
|
||||
process.env.NEXT_PUBLIC_HOSTNAME_LAN &&
|
||||
|
|
@ -29,7 +30,7 @@ export default function QuickCommands(props) {
|
|||
// Asynchronously call copy to clipboard
|
||||
navigator.clipboard
|
||||
.writeText(
|
||||
`borg init -e repokey-blake2 ssh://${props.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.repositoryName}`
|
||||
`borg init -e repokey-blake2 ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.repositoryName}`
|
||||
)
|
||||
.then(() => {
|
||||
// If successful, update the isCopied state value
|
||||
|
|
@ -49,8 +50,8 @@ export default function QuickCommands(props) {
|
|||
<div className={classes.copyValid}>Copied !</div>
|
||||
) : (
|
||||
<div className={classes.tooltip}>
|
||||
borg init -e repokey-blake2 ssh://{props.unixUser}@
|
||||
{HOSTNAME}:{SSH_SERVER_PORT}/./
|
||||
borg init -e repokey-blake2 ssh://{UNIX_USER}@{HOSTNAME}:
|
||||
{SSH_SERVER_PORT}/./
|
||||
{props.repositoryName}
|
||||
</div>
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ export default function Repo(props) {
|
|||
</div>
|
||||
)}
|
||||
<QuickCommands
|
||||
unixUser={props.unixUser}
|
||||
repositoryName={props.repositoryName}
|
||||
lanCommand={props.lanCommand}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ function WizardStep2(props) {
|
|||
//Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled.
|
||||
let HOSTNAME;
|
||||
let SSH_SERVER_PORT;
|
||||
let UNIX_USER = process.env.NEXT_PUBLIC_UNIX_USER;
|
||||
if (
|
||||
props.selectedOption.lanCommand &&
|
||||
process.env.NEXT_PUBLIC_HOSTNAME_LAN &&
|
||||
|
|
@ -39,12 +40,11 @@ function WizardStep2(props) {
|
|||
>
|
||||
<div className={classes.code}>
|
||||
borg init -e repokey-blake2 ssh://
|
||||
{props.selectedOption.unixUser}@{HOSTNAME}:
|
||||
{SSH_SERVER_PORT}/./
|
||||
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./
|
||||
{props.selectedOption.repositoryName}
|
||||
</div>
|
||||
<CopyButton
|
||||
dataToCopy={`borg init -e repokey-blake2 ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
|
||||
dataToCopy={`borg init -e repokey-blake2 ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
|
||||
/>
|
||||
</div>
|
||||
<div className={classes.note}>
|
||||
|
|
@ -95,12 +95,11 @@ function WizardStep2(props) {
|
|||
>
|
||||
<div className={classes.code}>
|
||||
ssh://
|
||||
{props.selectedOption.unixUser}@{HOSTNAME}:
|
||||
{SSH_SERVER_PORT}/./
|
||||
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./
|
||||
{props.selectedOption.repositoryName}
|
||||
</div>
|
||||
<CopyButton
|
||||
dataToCopy={`ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
|
||||
dataToCopy={`ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
|
||||
/>
|
||||
</div>
|
||||
For more information about the Vorta graphical client, please
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ function WizardStep3(props) {
|
|||
//Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled.
|
||||
let HOSTNAME;
|
||||
let SSH_SERVER_PORT;
|
||||
let UNIX_USER = process.env.NEXT_PUBLIC_UNIX_USER;
|
||||
if (
|
||||
props.selectedOption.lanCommand &&
|
||||
process.env.NEXT_PUBLIC_HOSTNAME_LAN &&
|
||||
|
|
@ -38,13 +39,12 @@ function WizardStep3(props) {
|
|||
>
|
||||
<div className={classes.code}>
|
||||
borg create ssh://
|
||||
{props.selectedOption.unixUser}@{HOSTNAME}:
|
||||
{SSH_SERVER_PORT}/./
|
||||
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./
|
||||
{props.selectedOption.repositoryName}
|
||||
::archive1 /your/pathToBackup
|
||||
</div>
|
||||
<CopyButton
|
||||
dataToCopy={`borg create ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repository}::archive1 /your/pathToBackup`}
|
||||
dataToCopy={`borg create ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repository}::archive1 /your/pathToBackup`}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -85,12 +85,11 @@ function WizardStep3(props) {
|
|||
>
|
||||
<div className={classes.code}>
|
||||
borg check -v --progress ssh://
|
||||
{props.selectedOption.unixUser}@{HOSTNAME}:
|
||||
{SSH_SERVER_PORT}/./
|
||||
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./
|
||||
{props.selectedOption.repositoryName}
|
||||
</div>
|
||||
<CopyButton
|
||||
dataToCopy={`borg check -v --progress ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
|
||||
dataToCopy={`borg check -v --progress ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
|
||||
/>
|
||||
</div>
|
||||
<li>List the remote archives with :</li>
|
||||
|
|
@ -103,12 +102,11 @@ function WizardStep3(props) {
|
|||
>
|
||||
<div className={classes.code}>
|
||||
borg list ssh://
|
||||
{props.selectedOption.unixUser}@{HOSTNAME}:
|
||||
{SSH_SERVER_PORT}/./
|
||||
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./
|
||||
{props.selectedOption.repositoryName}
|
||||
</div>
|
||||
<CopyButton
|
||||
dataToCopy={`borg list ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
|
||||
dataToCopy={`borg list ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
|
||||
/>
|
||||
</div>
|
||||
<li>Download a remote archive with the following command :</li>
|
||||
|
|
@ -121,13 +119,12 @@ function WizardStep3(props) {
|
|||
>
|
||||
<div className={classes.code}>
|
||||
borg export-tar --tar-filter="gzip -9" ssh://
|
||||
{props.selectedOption.unixUser}@{HOSTNAME}:
|
||||
{SSH_SERVER_PORT}/./
|
||||
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./
|
||||
{props.selectedOption.repositoryName}
|
||||
::archive1 archive1.tar.gz
|
||||
</div>
|
||||
<CopyButton
|
||||
dataToCopy={`borg export-tar --tar-filter="gzip -9" ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 archive1.tar.gz`}
|
||||
dataToCopy={`borg export-tar --tar-filter="gzip -9" ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 archive1.tar.gz`}
|
||||
/>
|
||||
</div>
|
||||
<li>
|
||||
|
|
@ -143,13 +140,12 @@ function WizardStep3(props) {
|
|||
>
|
||||
<div className={classes.code}>
|
||||
borg mount ssh://
|
||||
{props.selectedOption.unixUser}@{HOSTNAME}:
|
||||
{SSH_SERVER_PORT}/./
|
||||
{UNIX_USER}@{HOSTNAME}:{SSH_SERVER_PORT}/./
|
||||
{props.selectedOption.repositoryName}
|
||||
::archive1 /tmp/yourMountPoint
|
||||
</div>
|
||||
<CopyButton
|
||||
dataToCopy={`borg mount ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /tmp/yourMountPoint`}
|
||||
dataToCopy={`borg mount ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /tmp/yourMountPoint`}
|
||||
/>
|
||||
</div>
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ function WizardStep4(props) {
|
|||
//Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled.
|
||||
let HOSTNAME;
|
||||
let SSH_SERVER_PORT;
|
||||
let UNIX_USER = process.env.NEXT_PUBLIC_UNIX_USER;
|
||||
if (
|
||||
props.selectedOption.lanCommand &&
|
||||
process.env.NEXT_PUBLIC_HOSTNAME_LAN &&
|
||||
|
|
@ -29,7 +30,7 @@ function WizardStep4(props) {
|
|||
|
||||
repositories:
|
||||
# Paths of local or remote repositories to backup to.
|
||||
- ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}
|
||||
- ssh://${UNIX_USER}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}
|
||||
|
||||
storage:
|
||||
archive_name_format: '{HOSTNAME}-documents-{now}'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue