mirror of
https://github.com/hauke68/Magallanes.git
synced 2026-09-09 14:58:57 +02:00
Merge pull request #392 from WorldWarIII/SupportHostPortNotation
[FEATURE]Support colon notation in host config definition
This commit is contained in:
+13
-2
@@ -457,10 +457,10 @@ class Runtime
|
||||
*/
|
||||
public function getSSHConfig()
|
||||
{
|
||||
$sshConfig = $this->getEnvOption('ssh', ['port' => '22', 'flags' => '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no']);
|
||||
$sshConfig = $this->getEnvOption('ssh', ['flags' => '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no']);
|
||||
|
||||
if (!array_key_exists('port', $sshConfig)) {
|
||||
$sshConfig['port'] = '22';
|
||||
$sshConfig['port'] = $this->getHostPort();
|
||||
}
|
||||
|
||||
if (!array_key_exists('flags', $sshConfig)) {
|
||||
@@ -470,6 +470,17 @@ class Runtime
|
||||
return $sshConfig;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current Host Port or default ssh port
|
||||
*
|
||||
* @return integer
|
||||
*/
|
||||
public function getHostPort()
|
||||
{
|
||||
$info = explode(':', $this->getWorkingHost());
|
||||
return isset($info[1]) ? $info[1] : '22';
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a Temporal File name
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user