aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-09-02 20:48:37 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-09-02 20:48:37 -0300
commita392b0c9fb7279b6c232cdba84df4d3c76792f17 (patch)
tree8270607d3b47d36f7e6c3f68dfed6f032d85c510
parent01a4f76db05bc39816dd7aa3bc65e0f0d235f531 (diff)
downloadpuppet-backup-a392b0c9fb7279b6c232cdba84df4d3c76792f17.tar.gz
puppet-backup-a392b0c9fb7279b6c232cdba84df4d3c76792f17.tar.bz2
Removing unneeded hostname and user from ssh_cmd_base
-rw-r--r--files/handlers/rsync23
1 files changed, 1 insertions, 22 deletions
diff --git a/files/handlers/rsync b/files/handlers/rsync
index b4c16b7..2b9da5a 100644
--- a/files/handlers/rsync
+++ b/files/handlers/rsync
@@ -101,27 +101,6 @@
# You dont need to manually specify vservers using "include = /vservers".
# They are automatically backuped if vserver is set to "yes" on you backupninja.conf.
#
-# Changelog
-# ---------
-#
-# 20100825 - rhatto at riseup.net
-#
-# - Fixed lockfile checks for rsync handler
-# - Fixed ssh_cmd and RSYNC_RSH at rsync handler
-#
-# 20090329 - rhatto at riseup.net
-#
-# - Added support for:
-# - Remote destinations
-# - Long rotation format similar to maildir handler
-# - Batch files through --read-batch and --write-batch
-# - Custom file list using --files-from
-# - SSH persistent connection using ControlMaster
-# - The rsync:// protocol
-# - Metadata folder for each backup folder
-# - General refactoring
-# - Code cleanup
-#
# function definitions
@@ -284,7 +263,7 @@ function eval_config {
nice=""
fi
- ssh_cmd_base="ssh -T -o PasswordAuthentication=no -o Hostname=$host -p $port -l $user -i $id_file"
+ ssh_cmd_base="ssh -T -o PasswordAuthentication=no -p $port -i $id_file"
ssh_cmd="$ssh_cmd_base $user@$host"
if [ "$from" == "remote" ] || [ "$dest" == "remote" ]; then