diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-25 12:57:12 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-25 12:57:12 +0200 |
| commit | 71a20d4d95ad40060857d5da6b813f437267fbb2 (patch) | |
| tree | 2ac62cdff3ca7182bbc87c1980776a399d868bf3 /src | |
| parent | 1a44f1cb656557715d328818270b82c0c13d58a0 (diff) | |
Change the default for use-ssh-substituter to ‘true’
Now you only have to pass ‘--option ssh-substituter-hosts
nix-ssh@bla’ to enable SSH substitution.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/globals.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 28982ec15..82f3e952a 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -48,7 +48,7 @@ Settings::Settings() useSubstitutes = true; buildUsersGroup = getuid() == 0 ? "nixbld" : ""; useChroot = false; - useSshSubstituter = false; + useSshSubstituter = true; impersonateLinux26 = false; keepLog = true; compressLog = true; @@ -166,7 +166,7 @@ void Settings::update() #endif substituters.push_back(nixLibexecDir + "/nix/substituters/download-using-manifests.pl"); substituters.push_back(nixLibexecDir + "/nix/substituters/download-from-binary-cache.pl"); - if (useSshSubstituter) + if (useSshSubstituter && !sshSubstituterHosts.empty()) substituters.push_back(nixLibexecDir + "/nix/substituters/download-via-ssh"); } else substituters = tokenizeString<Strings>(subs, ":"); |