diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-03-16 14:19:32 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-03-16 14:19:32 +0100 |
| commit | 287084d688c3316d5840a9a7b5b2dff29b3dda94 (patch) | |
| tree | 84c37315daebbb822fbfd210f46c35d011ee21f8 | |
| parent | c5b83d8913d73ea58ff9437c41bf6bd0c6839ad0 (diff) | |
ssh:// -> ssh-ng://, legacy-ssh:// -> ssh://
| -rw-r--r-- | src/build-remote/build-remote.cc | 2 | ||||
| -rw-r--r-- | src/libstore/legacy-ssh-store.cc | 2 | ||||
| -rw-r--r-- | src/libstore/ssh-store.cc | 2 | ||||
| -rwxr-xr-x | src/nix-copy-closure/nix-copy-closure.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index 6b142db98..d7aee2886 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -233,7 +233,7 @@ int main (int argc, char * * argv) lock = -1; try { - sshStore = openStore("ssh://" + bestMachine->hostName, + sshStore = openStore("ssh-ng://" + bestMachine->hostName, { {"ssh-key", bestMachine->sshKey }, {"max-connections", "1" } }); hostName = bestMachine->hostName; diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc index 84bf0f727..0e838846c 100644 --- a/src/libstore/legacy-ssh-store.cc +++ b/src/libstore/legacy-ssh-store.cc @@ -8,7 +8,7 @@ namespace nix { -static std::string uriScheme = "legacy-ssh://"; +static std::string uriScheme = "ssh://"; struct LegacySSHStore : public Store { diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc index 20f020bda..2a81a8b1e 100644 --- a/src/libstore/ssh-store.cc +++ b/src/libstore/ssh-store.cc @@ -8,7 +8,7 @@ namespace nix { -static std::string uriScheme = "ssh://"; +static std::string uriScheme = "ssh-ng://"; class SSHStore : public RemoteStore { diff --git a/src/nix-copy-closure/nix-copy-closure.cc b/src/nix-copy-closure/nix-copy-closure.cc index ab80d96b5..ed43bffbc 100755 --- a/src/nix-copy-closure/nix-copy-closure.cc +++ b/src/nix-copy-closure/nix-copy-closure.cc @@ -47,7 +47,7 @@ int main(int argc, char ** argv) if (sshHost.empty()) 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 from = toMode ? openStore() : openStore(remoteUri); |