diff options
| author | Florian Wallner <florian.wallner@exxcellent.de> | 2019-11-13 18:07:55 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2020-01-01 02:10:34 +0300 |
| commit | 953c47a0e5144f0d53498b7e4955f05ffdd548e5 (patch) | |
| tree | ddf088288f3b1d0575465f5c9a910d1029485f23 | |
| parent | 13e4208d87e4bf3597e30946873088372d7aa5a8 (diff) | |
Extend the ssh configuration check by calling the echo command if the first check fails.v1.20.2
Signed-off-by: Florian Wallner <florian.wallner@exxcellent.de>
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp/BACKUPS/nc-rsync-auto.sh | 4 | ||||
| -rw-r--r-- | changelog.md | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/bin/ncp/BACKUPS/nc-rsync-auto.sh b/bin/ncp/BACKUPS/nc-rsync-auto.sh index 9e45f583..ed2510a1 100644 --- a/bin/ncp/BACKUPS/nc-rsync-auto.sh +++ b/bin/ncp/BACKUPS/nc-rsync-auto.sh @@ -28,10 +28,12 @@ configure() return 1; } + # Check if the ssh access is properly configured. For this purpose the command : or echo is called remotely. + # If one of the commands works, the test is successful. [[ "$DESTINATION" =~ : ]] && { local NET="$( sed 's|:.*||' <<<"$DESTINATION" )" local SSH=( ssh -o "BatchMode=yes" -p "$PORTNUMBER" "$NET" ) - ${SSH[@]} : || { echo "SSH non-interactive not properly configured"; return 1; } + ${SSH[@]} echo || { echo "SSH non-interactive not properly configured"; return 1; } } echo "0 5 */${SYNCDAYS} * * root /usr/bin/rsync -ax -e \"ssh -p $PORTNUMBER\" --delete \"$DATADIR\" \"$DESTINATION\"" > /etc/cron.d/ncp-rsync-auto diff --git a/changelog.md b/changelog.md index 6c553dbf..2b2b5bc1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v1.20.1](https://github.com/nextcloud/nextcloudpi/commit/5fb675b) (2019-12-19) Revert "build: dont use empty values by default" +[v1.20.2](https://github.com/nextcloud/nextcloudpi/commit/97cb2ff) (2019-11-13) Extend the ssh configuration check by calling the echo command if the first check fails. + +[v1.20.1](https://github.com/nextcloud/nextcloudpi/commit/6d0bc6b) (2019-12-19) Revert "build: dont use empty values by default" [v1.20.0 ](https://github.com/nextcloud/nextcloudpi/commit/f75c415) (2019-12-19) upgrade to NC17.0.2 |