From df5de9dfd72f9dc3d57157d0496443732a517491 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 19 Feb 2014 07:05:15 -0500
Subject: Add use-ssh-substituter setting.

It defaults to false and can be overridden by RemoteStore.

Untested currently, just quickly put this together
---
 src/libstore/globals.cc | 2 ++
 src/libstore/globals.hh | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'src/libstore')

diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 40000c9db572..f9007775a12e 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -41,6 +41,7 @@ Settings::Settings()
     syncBeforeRegistering = false;
     useSubstitutes = true;
     useChroot = false;
+    useSshSubstituter = false;
     dirsInChroot.insert("/dev");
     dirsInChroot.insert("/dev/pts");
     impersonateLinux26 = false;
@@ -153,6 +154,7 @@ void Settings::update()
     get(autoOptimiseStore, "auto-optimise-store");
     get(envKeepDerivations, "env-keep-derivations");
     get(sshSubstituterHosts, "ssh-substituter-hosts");
+    get(useSshSubstituter, "use-ssh-substituter");
 }
 
 
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 31324478b6d3..711c3652947f 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -149,6 +149,9 @@ struct Settings {
     /* Set of ssh connection strings for the ssh substituter */
     Strings sshSubstituterHosts;
 
+    /* Whether to use the ssh substituter at all */
+    bool useSshSubstituter;
+
     /* Whether to impersonate a Linux 2.6 machine on newer kernels. */
     bool impersonateLinux26;
 
-- 
cgit 1.4.1