aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTharre <tharre3@gmail.com>2019-04-21 19:38:23 +0200
committerTharre <tharre3@gmail.com>2019-04-21 19:44:51 +0200
commit3d3996edaf169424babc8b9da6bde6ea1051d3db (patch)
tree48865eeeafc770b9053fce9f652f2252979da580
parent090f2d964d99d78700415a0084e2170aaf148a79 (diff)
downloadpkgbuilds-3d3996edaf169424babc8b9da6bde6ea1051d3db.tar.gz
pkgbuilds-3d3996edaf169424babc8b9da6bde6ea1051d3db.tar.xz
pkgbuilds-3d3996edaf169424babc8b9da6bde6ea1051d3db.zip
arch-system: borgbackup: use proper ssh timeout
ConnectTimeout merely specifies the TCP timeout, what we really want is ServerAliceInterval, which makes the client send a null packet every X seconds.
-rw-r--r--arch-system/PKGBUILD2
-rwxr-xr-xarch-system/borgbackup2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch-system/PKGBUILD b/arch-system/PKGBUILD
index 553a8a8..a753385 100644
--- a/arch-system/PKGBUILD
+++ b/arch-system/PKGBUILD
@@ -32,7 +32,7 @@ sha256sums=('bb00c42f2802c12536c46700b948d41a43153d97a6986827b7c61203880e1ad1'
'ea50cd57140fc3a27c027de7c289f058c23c840cc9ce65593969e8e2dd5b8e65'
'42050ba722df1cd606288e82054e131dac99bf10506f4c8d52eb9bfc0a078d89'
'e1bf3dc5978a7641f86975b7ee770a6914b30a8e4b7e3be2f1b07eaa7098591d'
- 'e1e862b4be6aa666bd1ca2ddd01eb5e57e063d1a2d23b60666ae6006be9ad929'
+ '576ea8f97e757d6d9b7f7a02e65d0b1999ec2b9b29bd20eca5515d9d3843edb1'
'5613c98d32e513a973e8a0e250ab0b267882a73615f507b6208d4a5f21487fe6')
package_base-system() {
diff --git a/arch-system/borgbackup b/arch-system/borgbackup
index 9368452..8467b16 100755
--- a/arch-system/borgbackup
+++ b/arch-system/borgbackup
@@ -6,7 +6,7 @@ BORG_HOST="12390@ch-s012.rsync.net"
export BORG_REPO="$BORG_HOST:repos/$(hostname)"
export BORG_PASSPHRASE="$(< ~/.borg_secret)"
export BORG_RSH="ssh -o IdentitiesOnly=yes -o ConnectionAttempts=20 \
- -o ConnectTimeout=30 -i ~/.ssh/borg_key"
+ -o ServerAliveInterval=30 -i ~/.ssh/borg_key"
export LC_COLLATE=C
SNAPSHOT_TARGET="/.snapshots/home-$(date "+%Y-%m-%dT%H:%M:%S")"