[tor-commits] [chutney/master] Allow specifying the Chutney data directory.

[nickm at torproject.org]

commit 05047a2dff5e11da177e855de90c4a2455c79c6c
Author: anonym <anonym at riseup.net>
Date:   Thu Apr 14 21:41:13 2016 +0200

    Allow specifying the Chutney data directory.
    
    It is controlled with the CHUTNEY_DATA_DIR environment variable, but
    defaults to the 'net' sub-directory of the Chutney source tree.
---
 lib/chutney/TorNet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 8bb4c6a..6a507e8 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -669,7 +669,7 @@ DEFAULTS = {
     'hs_directory': 'hidden_service',
     'hs-hostname': None,
     'connlimit': 60,
-    'net_base_dir': 'net',
+    'net_base_dir': os.environ.get('CHUTNEY_DATA_DIR', 'net'),
     'tor': os.environ.get('CHUTNEY_TOR', 'tor'),
     'tor-gencert': os.environ.get('CHUTNEY_TOR_GENCERT', None),
     'auth_cert_lifetime': 12,