git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #56175 from MostAwesomeDude/tahoe-service

Fix tahoe service

commit0040ca936e475d34a514b480002622e641b52d90 authorSilvan Mosberger <infinisil@icloud.com> dateSat 25 May 2019, 21:53 (7 years ago) parentef35ad100d6b4c
1 file changed+8−5
nixos/modules/services/network-filesystems/tahoe.nix+8−5
nixos/modules/services/network-filesystems/tahoe.nix+8−5
@@ -234,16 +234,19 @@ in
234234 Type = "simple";
235235 PIDFile = pidfile;
236236 # Believe it or not, Tahoe is very brittle about the order of
237− # arguments to $(tahoe start). The node directory must come first,
237+ # arguments to $(tahoe run). The node directory must come first,
238238 # and arguments which alter Twisted's behavior come afterwards.
239239 ExecStart = ''
240− ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile}
240+ ${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile}
241241 '';
242242 };
243243 preStart = ''
244244 if [ ! -d ${lib.escapeShellArg nodedir} ]; then
245245 mkdir -p /var/db/tahoe-lafs
246− tahoe create-introducer ${lib.escapeShellArg nodedir}
246+ # See https://github.com/NixOS/nixpkgs/issues/25273
247+ tahoe create-introducer \
248+ --hostname="${config.networking.hostName}" \
249+ ${lib.escapeShellArg nodedir}
247250 fi
248251
249252 # Tahoe has created a predefined tahoe.cfg which we must now
@@ -334,10 +337,10 @@ in
334337 Type = "simple";
335338 PIDFile = pidfile;
336339 # Believe it or not, Tahoe is very brittle about the order of
337− # arguments to $(tahoe start). The node directory must come first,
340+ # arguments to $(tahoe run). The node directory must come first,
338341 # and arguments which alter Twisted's behavior come afterwards.
339342 ExecStart = ''
340− ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile}
343+ ${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile}
341344 '';
342345 };
343346 preStart = ''