From c83b5f382d6b4d523143338a84ca2ed87946d642 Mon Sep 17 00:00:00 2001 From: Dominik Zogg Date: Mon, 12 Dec 2011 11:26:01 +0100 Subject: [PATCH 1/2] port is not a part of the configuration use rsync_port insteat --- Deployer/Rsync.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Deployer/Rsync.php b/Deployer/Rsync.php index 11df8ea..55090ef 100644 --- a/Deployer/Rsync.php +++ b/Deployer/Rsync.php @@ -146,8 +146,9 @@ protected function buildCommand(array $connection, array $rules, $real = false) $options = array(); $options[] = $this->config['options']; - if (!empty($connection['port'])) { - $options[] = '-p '.$connection['port']; + if (!empty($connection['rsync_port'])) { + $options[] = '-p '.$connection['rsync_port']; + } } if ($this->config['delete']) { From ad144a4afa24bbefb8129db29a331bb1502f58d2 Mon Sep 17 00:00:00 2001 From: Dominik Zogg Date: Mon, 12 Dec 2011 11:26:22 +0100 Subject: [PATCH 2/2] add ssh port --- Deployer/Rsync.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Deployer/Rsync.php b/Deployer/Rsync.php index 55090ef..b1e93fa 100644 --- a/Deployer/Rsync.php +++ b/Deployer/Rsync.php @@ -149,6 +149,9 @@ protected function buildCommand(array $connection, array $rules, $real = false) if (!empty($connection['rsync_port'])) { $options[] = '-p '.$connection['rsync_port']; } + + if ($connection['ssh_port'] != 22) { + $options[] = sprintf('--rsh="ssh -p%d"', $connection['ssh_port']); } if ($this->config['delete']) {