1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-20 18:58:56 +01:00

Remove -t -t from Drydock SSH interface

Summary: These arguments prevent stderr from being routed correctly for Linux hosts and break Windows entirely.  Removing them fixes the issue.

Test Plan: Removed those options and both Linux and Windows hosts had their output fed back into Harbormaster correctly.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Maniphest Tasks: T4111, T1029

Differential Revision: https://secure.phabricator.com/D7710
This commit is contained in:
James Rhodes 2013-12-05 14:59:46 +11:00
parent a8b27130cb
commit 48e80f0541

View file

@ -44,10 +44,8 @@ final class DrydockSSHCommandInterface extends DrydockCommandInterface {
$full_command = 'C:\\Windows\\system32\\cmd.exe /C '.$full_command;
}
// NOTE: The "-t -t" is for psuedo-tty allocation so we can "sudo" on some
// systems, but maybe more trouble than it's worth?
return new ExecFuture(
'ssh -t -t -o StrictHostKeyChecking=no -p %s -i %P %P@%s -- %s',
'ssh -o StrictHostKeyChecking=no -p %s -i %P %P@%s -- %s',
$this->getConfig('port'),
$this->passphraseSSHKey->getKeyfileEnvelope(),
$this->passphraseSSHKey->getUsernameEnvelope(),