mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Honor $NIX_SSHOPTS again

Browse source 
NixOps needs this.
This commit is contained in:
Eelco Dolstra 2017-03-21 14:35:50 +01:00
parent 20df50d8e1
commit 3229f85585
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/libstore/ssh.cc
View file

@ -2,6 +2,16 @@
namespace nix { namespace nix {
void SSHMaster::addCommonSSHOpts(Strings & args)
{
for (auto & i : tokenizeString<Strings>(getEnv("NIX_SSHOPTS")))
args.push_back(i);
if (!keyFile.empty())
args.insert(args.end(), {"-i", keyFile});
if (compress)
args.push_back("-C");
}
std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string & command) std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string & command)
{ {
Path socketPath = startMaster(); Path socketPath = startMaster();
@ -23,10 +33,7 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
throw SysError("duping over stdout"); throw SysError("duping over stdout");
Strings args = { "ssh", host.c_str(), "-x", "-a" }; Strings args = { "ssh", host.c_str(), "-x", "-a" };
if (!keyFile.empty()) addCommonSSHOpts(args);
args.insert(args.end(), {"-i", keyFile});
if (compress)
args.push_back("-C");
if (socketPath != "") if (socketPath != "")
args.insert(args.end(), {"-S", socketPath}); args.insert(args.end(), {"-S", socketPath});
args.push_back(command); args.push_back(command);
@ -73,11 +80,7 @@ Path SSHMaster::startMaster()
, "-o", "LocalCommand=echo started" , "-o", "LocalCommand=echo started"
, "-o", "PermitLocalCommand=yes" , "-o", "PermitLocalCommand=yes"
}; };
if (!keyFile.empty()) addCommonSSHOpts(args);
args.insert(args.end(), {"-i", keyFile});
if (compress)
args.push_back("-C");
execvp(args.begin()->c_str(), stringsToCharPtrs(args).data()); execvp(args.begin()->c_str(), stringsToCharPtrs(args).data());
throw SysError("starting SSH master"); throw SysError("starting SSH master");

2
src/libstore/ssh.hh
View file

@ -23,6 +23,8 @@ private:
Sync<State> state_; Sync<State> state_;
void addCommonSSHOpts(Strings & args);
public: public:
SSHMaster(const std::string & host, const std::string & keyFile, bool useMaster, bool compress) SSHMaster(const std::string & host, const std::string & keyFile, bool useMaster, bool compress)