Skip to content

Commit dc4fb89

Browse files
committed
Explicitly use ssh for rsync communication
1 parent f894a25 commit dc4fb89

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

buildserver/build_package.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,6 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
144144
if ($hostname) {
145145
bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
146146
if ($new_file) {
147-
bash-command -command "rsync -a $setup_file $hostname/$branch"
147+
bash-command -command "rsync -e ssh -a $setup_file $hostname/$branch"
148148
}
149149
}

buildserver/upload_build_log.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function create_remote_dir()
2323
# For this hack $base_dir is just an arbitrary existing directory
2424
# It doesn't matter which one
2525
# No files will be copied from it anyway because of the exclude parameter
26-
rsync -a --exclude='*' "$base_dir"/ "$1"
26+
rsync -e ssh -a --exclude='*' "$base_dir"/ "$1"
2727
fi
2828
}
2929

@@ -37,7 +37,7 @@ then
3737
# the final remote directory to store it
3838
# So let's just store it in the top-level so we have a trace
3939
# of the build start or very early failures
40-
rsync -a "$log_file" "$host"/build-logs
40+
rsync -e ssh -a "$log_file" "$host"/build-logs
4141
else
4242
# Now the subdirectory to store the log file is is known
4343
# In addition group per month to simplify navigation even more
@@ -46,14 +46,14 @@ then
4646
create_remote_dir "$host"/build-logs/$remote_branch_dir
4747
create_remote_dir "$host"/build-logs/$remote_branch_dir/$month_part
4848

49-
rsync -a "$log_file" "$host"/build-logs/$remote_branch_dir/$month_part
49+
rsync -e ssh -a "$log_file" "$host"/build-logs/$remote_branch_dir/$month_part
5050

5151
# Finally remove the initially start build log uploaded earlier
5252
# Disable fatal error handling though to prevent the complete script from exiting
5353
# if no early build log exists
5454
echo "Removing initial startup build log uploaded earlier"
5555
set +ex
56-
rsync -rv --delete --include="$(basename $log_file)" --exclude='*' "$base_dir"/ "$host"/build-logs/
56+
rsync -e ssh -rv --delete --include="$(basename $log_file)" --exclude='*' "$base_dir"/ "$host"/build-logs/
5757
set -ex
5858
fi
5959
fi

0 commit comments

Comments
 (0)