aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-08-17 10:58:55 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-08-17 10:58:55 -0300
commit03b6ba6e7384943d30fe07f3d7fe94d47bdf012d (patch)
treef516de24dca86a358fabbfb8e18df154327a3db6
parent2d758167d0e10e650081302aba17f6de49b2feda (diff)
downloadpuppet-backup-03b6ba6e7384943d30fe07f3d7fe94d47bdf012d.tar.gz
puppet-backup-03b6ba6e7384943d30fe07f3d7fe94d47bdf012d.tar.bz2
Fixing ssh_cmd and RSYNC_RSH at rsync handler
-rw-r--r--files/handlers/rsync4
1 files changed, 2 insertions, 2 deletions
diff --git a/files/handlers/rsync b/files/handlers/rsync
index ab0b2ed..44f9e7f 100644
--- a/files/handlers/rsync
+++ b/files/handlers/rsync
@@ -279,7 +279,7 @@ function eval_config {
nice=""
fi
- ssh_cmd="ssh -T -o PasswordAuthentication=no $host -p $port -l $user -i $id_file"
+ ssh_cmd="ssh -T -o PasswordAuthentication=no -o Hostname=$host -p $port -l $user -i $id_file"
if [ "$from" == "remote" ] || [ "$dest" == "remote" ]; then
if [ "$testconnect" == "yes" ] && [ "$protocol" == "ssh" ]; then
@@ -913,7 +913,7 @@ function set_rsync_options {
else
debug RSYNC_RSH=\"$ssh_cmd\"
echo RSYNC_RSH=\"$ssh_cmd\" >> $log
- RSYNC_RSH="$ssh_cmd"
+ export RSYNC_RSH="$ssh_cmd"
fi
fi