]> gitweb.fluxo.info Git - puppet-backup.git/commitdiff
Fixing ssh_cmd and RSYNC_RSH at rsync handler
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 17 Aug 2010 13:58:55 +0000 (10:58 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 17 Aug 2010 13:58:55 +0000 (10:58 -0300)
files/handlers/rsync

index ab0b2ed920e313192c5f97ec8e36ad02405d5c85..44f9e7f1aab5f5d90877f187a4be5226194aeeec 100644 (file)
@@ -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