hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-11-04 00:50:18 +01:00
Code Issues Releases Wiki Activity

Tweak on yaml parser. Added option for ssh port.

Browse Source
This commit is contained in:
Andrs Montaez 2012-02-15 18:45:59 -02:00
parent 565078a7f8
commit 2ec4f58c77
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mage/Config.php
View File

@ -116,7 +116,7 @@ class Mage_Config
$config = $this->getEnvironment(); $config = $this->getEnvironment();
if (isset($config[$type]) && isset($config[$type][$stage])) { if (isset($config[$type]) && isset($config[$type][$stage])) {
$tasks = (array) $config[$type][$stage]; $tasks = ($config[$type][$stage] ? (array) $config[$type][$stage] : array());
} }
return $tasks; return $tasks;

1
Mage/Task/BuiltIn/Deployment/Rsync.php
View File

@ -36,6 +36,7 @@ class Mage_Task_BuiltIn_Deployment_Rsync
} }
$command = 'rsync -avz ' $command = 'rsync -avz '
. '--rsh="ssh -p' . $this->_config->deployment('port', '22') . '" '
. $this->_excludes(array_merge($excludes, $userExcludes)) . ' ' . $this->_excludes(array_merge($excludes, $userExcludes)) . ' '
. $this->_config->deployment('from') . ' ' . $this->_config->deployment('from') . ' '
. $this->_config->deployment('user') . '@' . $this->_config->getHost() . ':' . $deployToDirectory; . $this->_config->deployment('user') . '@' . $this->_config->getHost() . ':' . $deployToDirectory;

3
Mage/Task/TaskAbstract.php
View File

@ -45,7 +45,8 @@ abstract class Mage_Task_TaskAbstract
$releasesDirectory = ''; $releasesDirectory = '';
} }
$localCommand = 'ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ' $localCommand = 'ssh -p ' . $this->_config->deployment('port', '22') . ' '
. '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
. $this->_config->deployment('user') . '@' . $this->_config->getHost() . ' ' . $this->_config->deployment('user') . '@' . $this->_config->getHost() . ' '
. '"cd ' . rtrim($this->_config->deployment('to'), '/') . $releasesDirectory . ' && ' . '"cd ' . rtrim($this->_config->deployment('to'), '/') . $releasesDirectory . ' && '
. $command . '"'; . $command . '"';