aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTharre <tharre3@gmail.com>2018-06-15 18:11:40 +0200
committerTharre <tharre3@gmail.com>2018-06-15 18:12:31 +0200
commit82bfa9338a6f3062c88aa5d5fabf488d0e06bab6 (patch)
tree73cbc020417879b31dde598d0843d17281996d0e
parentc8f48e8c7f11dc82c9505487abff26df83c97cad (diff)
downloadpkgbuilds-82bfa9338a6f3062c88aa5d5fabf488d0e06bab6.tar.gz
pkgbuilds-82bfa9338a6f3062c88aa5d5fabf488d0e06bab6.tar.xz
pkgbuilds-82bfa9338a6f3062c88aa5d5fabf488d0e06bab6.zip
arch-system: borgbackup: use correct key with ssh
-rw-r--r--arch-system/PKGBUILD2
-rwxr-xr-xarch-system/borgbackup5
2 files changed, 4 insertions, 3 deletions
diff --git a/arch-system/PKGBUILD b/arch-system/PKGBUILD
index 7ef406f..d565d96 100644
--- a/arch-system/PKGBUILD
+++ b/arch-system/PKGBUILD
@@ -31,7 +31,7 @@ sha256sums=('bb00c42f2802c12536c46700b948d41a43153d97a6986827b7c61203880e1ad1'
'99cd268de0e9b847d65f802e7bcbbf7318398a04db61523545d4002ebdfb4d9c'
'42050ba722df1cd606288e82054e131dac99bf10506f4c8d52eb9bfc0a078d89'
'e1bf3dc5978a7641f86975b7ee770a6914b30a8e4b7e3be2f1b07eaa7098591d'
- '90c1cad5ec73476af891e701f6c369b0c33692a5b7189bc4f3b8cc970b7495ef'
+ '2a83098da881761473e2e67cd4dc6ab5e2da5e5a3187b7505bf58cf726d35bec'
'b9f38ad0731a5b65d49eaacd0fb8cfe051b6ca7ea68496d89919701842183d89')
package_base-system() {
diff --git a/arch-system/borgbackup b/arch-system/borgbackup
index 9c298c5..14b4795 100755
--- a/arch-system/borgbackup
+++ b/arch-system/borgbackup
@@ -56,8 +56,9 @@ if [ ! -d "$SNAPSHOT_TARGET" ]; then
sudo -n backup-sudo snapshot "$SNAPSHOT_TARGET"
fi
-if ! ssh -To BatchMode=yes -o ConnectTimeout=$NETWORK_TIMEOUT "$BORG_HOST" \
- "borg --version" > /dev/null; then
+if ! ssh -To BatchMode=yes -o ConnectTimeout=$NETWORK_TIMEOUT \
+ -o IdentitiesOnly=yes -o ConnectionAttempts=20 -i ~/.ssh/borg_key \
+ "$BORG_HOST" "borg --version" > /dev/null; then
echo "SSH server not reachable, skipping upload" >&2
exit 0
fi