Skip to content
Snippets Groups Projects
Commit 78d66278 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Use "--allow-stdin-close" to keep Tahoe-LAFS running when daemonized

Also update to the latest Tahoe-LAFS so this option is available.
parent 5d46e631
No related branches found
No related tags found
2 merge requests!395Add a read-only Great Black Swamp storage server to each storage node,!384update production
......@@ -221,7 +221,7 @@ in
# arguments to $(tahoe run). The node directory must come first,
# and arguments which alter Twisted's behavior come afterwards.
ExecStart = ''
${settings.package}/bin/tahoe --eliot-destination ${eliotLog} run ${nodedir} -n -l- --pidfile=${pidfile}
${settings.package}/bin/tahoe --eliot-destination ${eliotLog} run --allow-stdin-close ${nodedir} -n -l- --pidfile=${pidfile}
'';
# Twisted wants non-blocking sockets:
......
......@@ -4,7 +4,7 @@ let
repo = fetchFromGitHub (builtins.removeAttrs repo-data [ "branch" ]);
zk = import repo;
# XXX package version choice here
zkapauthorizer = zk.outputs.packages.x86_64-linux.zkapauthorizer-python39-tahoe_1_17_1;
zkapauthorizer = zk.outputs.packages.x86_64-linux.zkapauthorizer-python39-tahoe_dev;
python = zkapauthorizer.passthru.python;
in
python.withPackages (ps: [ zkapauthorizer ] )
{
"owner": "PrivateStorageio",
"branch": "458.update-tahoe-lafs",
"branch": "main",
"repo": "ZKAPAuthorizer",
"rev": "6f8d67c81cdc6de2f52e0a699a077b43232a0589",
"rev": "fb89e91a6c7f595cd0b1c7aa7055cbd32c482180",
"outputHashAlgo": "sha512",
"outputHash": "3bg882wlm0bn23xazal81mzac63svg66gcbrabvzqyin98jrwlimk5n64hrdiywiw954g7srpdr1g9f1y4p79vbpnkfkrv7sa108aa4"
"outputHash": "3f44znykq8f7mcgdwdyhgf2dvnx7yydmlrjcr17mxfwya4jqmx8zb59mxkxvar0ahn639y2nq3bcqxdyipljfxilfi1cz21li908kkw"
}
\ No newline at end of file
......@@ -43,7 +43,7 @@ def main():
"daemonize",
"-o", "/tmp/stdout",
"-e", "/tmp/stderr",
which("tahoe"), "run", "/tmp/client",
which("tahoe"), "run", "--allow-stdin-close", "/tmp/client",
])
def run(argv):
......
......@@ -31,7 +31,7 @@ def main():
"daemonize",
"-o", "/tmp/stdout",
"-e", "/tmp/stderr",
which("tahoe"), "run", "/tmp/introducer",
which("tahoe"), "run", "--allow-stdin-close", "/tmp/introducer",
])
retry(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment