about summary refs log tree commit diff
path: root/src/libstore
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-25T10·57+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-25T10·57+0200
commit71a20d4d95ad40060857d5da6b813f437267fbb2 (patch)
tree2ac62cdff3ca7182bbc87c1980776a399d868bf3 /src/libstore
parent1a44f1cb656557715d328818270b82c0c13d58a0 (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/libstore')
-rw-r--r--src/libstore/globals.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 28982ec15078..82f3e952a0b5 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, ":");