From 5a1f2502d2a7cf21b938af426a9ab15cb5a1fc02 Mon Sep 17 00:00:00 2001 From: Jakub Turek Date: Sun, 8 Mar 2015 13:06:27 +0100 Subject: [PATCH] [#202] Remove inconsistency in ssh options Add UserKnownHostsFile and StrictHostKeyChecking to scp command in TarGz strategy. --- Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php b/Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php index 2345860..6e9f3bb 100644 --- a/Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php +++ b/Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php @@ -92,8 +92,12 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware } // Copy Tar Gz to Remote Host - $command = 'scp ' . $strategyFlags . ' ' . $this->getConfig()->getHostIdentityFileOption() . $this->getConfig()->getConnectTimeoutOption() . '-P ' . $this->getConfig()->getHostPort() . ' ' . $localTarGz . '.tar.gz ' - . $this->getConfig()->deployment('user') . '@' . $this->getConfig()->getHostName() . ':' . $deployToDirectory; + $command = 'scp ' . $strategyFlags . ' ' . $this->getConfig()->getHostIdentityFileOption() + . $this->getConfig()->getConnectTimeoutOption() . '-P ' . $this->getConfig()->getHostPort() + . " -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no " + . ' ' . $localTarGz . '.tar.gz ' + . $this->getConfig()->deployment('user') . '@' . $this->getConfig()->getHostName() . ':' + . $deployToDirectory; $result = $this->runCommandLocal($command) && $result; // Strategy Flags