jaiden/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

ssh:// -> ssh-ng://, legacy-ssh:// -> ssh://

Browse source
This commit is contained in:
Eelco Dolstra 2017-03-16 14:19:32 +01:00
parent c5b83d8913
commit 287084d688
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/build-remote/build-remote.cc
View file

@ -233,7 +233,7 @@ int main (int argc, char * * argv)
lock = -1; lock = -1;
try { try {
sshStore = openStore("ssh://" + bestMachine->hostName, sshStore = openStore("ssh-ng://" + bestMachine->hostName,
{ {"ssh-key", bestMachine->sshKey }, { {"ssh-key", bestMachine->sshKey },
{"max-connections", "1" } }); {"max-connections", "1" } });
hostName = bestMachine->hostName; hostName = bestMachine->hostName;

2
src/libstore/legacy-ssh-store.cc
View file

@ -8,7 +8,7 @@
namespace nix { namespace nix {
static std::string uriScheme = "legacy-ssh://"; static std::string uriScheme = "ssh://";
struct LegacySSHStore : public Store struct LegacySSHStore : public Store
{ {

2
src/libstore/ssh-store.cc
View file

@ -8,7 +8,7 @@
namespace nix { namespace nix {
static std::string uriScheme = "ssh://"; static std::string uriScheme = "ssh-ng://";
class SSHStore : public RemoteStore class SSHStore : public RemoteStore
{ {

2
src/nix-copy-closure/nix-copy-closure.cc
View file

@ -47,7 +47,7 @@ int main(int argc, char ** argv)
if (sshHost.empty()) if (sshHost.empty())
throw UsageError("no host name specified"); throw UsageError("no host name specified");
auto remoteUri = "legacy-ssh://" + sshHost + (gzip ? "?compress=true" : ""); auto remoteUri = "ssh://" + sshHost + (gzip ? "?compress=true" : "");
auto to = toMode ? openStore(remoteUri) : openStore(); auto to = toMode ? openStore(remoteUri) : openStore();
auto from = toMode ? openStore() : openStore(remoteUri); auto from = toMode ? openStore() : openStore(remoteUri);