95/376: Change the default for use-ssh-substituter to ‘true’

[Ludovic Courtès]

civodul pushed a commit to tag 1.8
in repository guix.

commit 71a20d4d95ad40060857d5da6b813f437267fbb2
Author: Eelco Dolstra <address@hidden>
Date:   Fri Jul 25 12:57:12 2014 +0200

    Change the default for use-ssh-substituter to ‘true’
    
    Now you only have to pass ‘--option ssh-substituter-hosts
    address@hidden to enable SSH substitution.
---
 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 28982ec..82f3e95 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, ":");