|
@@ -1038,6 +1038,7 @@ DEFAULTS = {
|
|
|
'hs': False,
|
|
|
'hs_directory': 'hidden_service',
|
|
|
'hs-hostname': None,
|
|
|
+ 'daemon': True,
|
|
|
'connlimit': 60,
|
|
|
'net_base_dir': get_absolute_net_path(),
|
|
|
'tor': os.environ.get('CHUTNEY_TOR', 'tor'),
|
|
@@ -1208,6 +1209,9 @@ class TorEnviron(chutney.Templating.Environ):
|
|
|
def _get_valgrind_log(self, my):
|
|
|
return os.path.join(self['dir'], 'valgrind.log')
|
|
|
|
|
|
+ def _get_daemon_int(self, my):
|
|
|
+ return 1 if self['daemon'] else 0
|
|
|
+
|
|
|
# A hs generates its key on first run,
|
|
|
# so check for it at the last possible moment,
|
|
|
# but cache it in memory to avoid repeatedly reading the file
|