Merge pull request #1029 from johanmeiring/nativessh-config-file

Support for SSH config file in NativeSsh implementation
deployphp · Feb 18, 2017 · c08840b · c08840b
2 parents b8a4207 + 677b6ea
commit c08840b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ### Added
 - Add a way to retrieve a defined task [#1008](https://github.com/deployphp/deployer/pull/1008)
+- Add support for configFile in the NativeSsh implementation [#979](https://github.com/deployphp/deployer/pull/979)
 
 ### Changed
 - Autoload functions via Composer [#1015](https://github.com/deployphp/deployer/pull/1015)

diff --git a/src/Server/Remote/NativeSsh.php b/src/Server/Remote/NativeSsh.php
@@ -65,6 +65,10 @@ public function run($command)
         }
         $hostname = $serverConfig->getHost();
 
+        if ($serverConfig->getConfigFile()) {
+            $sshOptions[] = '-F ' . escapeshellarg($serverConfig->getConfigFile());
+        }
+
         if ($serverConfig->getPort()) {
             $sshOptions[] = '-p ' . escapeshellarg($serverConfig->getPort());
         }
@@ -134,6 +138,10 @@ public function scpCopy($target, $target2)
 
         $scpOptions = [];
 
+        if ($serverConfig->getConfigFile()) {
+            $scpOptions[] = '-F ' . escapeshellarg($serverConfig->getConfigFile());
+        }
+
         if ($serverConfig->getPort()) {
             $scpOptions[] = '-P ' . escapeshellarg($serverConfig->getPort());
         }
@@ -241,6 +249,9 @@ public function initMultiplexing()
         $hostname = $serverConfig->getHost();
 
         $sshOptions = [];
+        if ($serverConfig->getConfigFile()) {
+            $sshOptions[] = '-F ' . escapeshellarg($serverConfig->getConfigFile());
+        }
         if ($serverConfig->getPort()) {
             $sshOptions[] = '-p ' . escapeshellarg($serverConfig->getPort());
         }