From 71a20d4d95ad40060857d5da6b813f437267fbb2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Jul 2014 12:57:12 +0200
Subject: [PATCH] =?UTF-8?q?Change=20the=20default=20for=20use-ssh-substitu?=
 =?UTF-8?q?ter=20to=20=E2=80=98true=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now you only have to pass ‘--option ssh-substituter-hosts
nix-ssh@bla’ to enable SSH substitution.
---
 src/libstore/globals.cc | 4 ++--
 1 file 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, ":");