Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support multiple repositories (values separated by ;) #149

Open
wants to merge 1 commit into
base: testing
Choose a base branch
from
Open

Support multiple repositories (values separated by ;) #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions conf/backup_method
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@ app="${0#"./05-"}"
app="${app%"_app"}"

BORG_PASSPHRASE="$(yunohost app setting $app passphrase)"
repo="$(yunohost app setting $app repository)" #$4
repos="$(yunohost app setting $app repository)" #$4
if ssh-keygen -F "__SERVER__" >/dev/null ; then
Copy link
Contributor

@zamentur zamentur Apr 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if there are several repos, i guess we should adapt this part to. __SERVER__ is extracted from repository var if i remember well. And i think we should improve this part by deducing server from $repository (instead of hradcoding it during install script...)

BORG_RSH="ssh -i /root/.ssh/id_${app}_ed25519 -oStrictHostKeyChecking=yes "
else
BORG_RSH="ssh -i /root/.ssh/id_${app}_ed25519 -oStrictHostKeyChecking=no "
fi

sanitize_repo() {
repo="$1"
echo "$repo" | sed "s/(^\s*|\s*$)//g" # Trim the spaces
}

do_need_mount() {
true
}
Expand Down Expand Up @@ -78,15 +83,21 @@ name="$3"
size="$5"
description="$6"

saveIFS="$IFS"
IFS=$';' array_repos=($repos)
IFS="$saveIFS"

case "$1" in
need_mount)
do_need_mount "$work_dir" "$name" "$repo" "$size" "$description"
do_need_mount "$work_dir" "$name" "$(sanitize_repo "$array_repos[0]")" "$size" "$description"
;;
backup)
do_backup "$work_dir" "$name" "$repo" "$size" "$description"
for repo in "${array_repos[@]}"; do
do_backup "$work_dir" "$name" "$(sanitize_repo "$repo")" "$size" "$description"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep in mind if the first borg command to create the repo failed, the second won't be runned... (so it's not totally the same behavior than install twice the app)

done
;;
mount)
do_mount
do_mount "$work_dir" "$name" "$(sanitize_repo "$array_repos[0]")" "$size" "$description"
;;
*)
echo "hook called with unknown argument \`$1'" >&2
Expand Down