Merge pull request #56175 from MostAwesomeDude/tahoe-service
Fix tahoe service
This commit is contained in:
commit
0040ca936e
@ -234,16 +234,19 @@ in
|
|||||||
Type = "simple";
|
Type = "simple";
|
||||||
PIDFile = pidfile;
|
PIDFile = pidfile;
|
||||||
# Believe it or not, Tahoe is very brittle about the order of
|
# Believe it or not, Tahoe is very brittle about the order of
|
||||||
# arguments to $(tahoe start). The node directory must come first,
|
# arguments to $(tahoe run). The node directory must come first,
|
||||||
# and arguments which alter Twisted's behavior come afterwards.
|
# and arguments which alter Twisted's behavior come afterwards.
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile}
|
${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
preStart = ''
|
preStart = ''
|
||||||
if [ ! -d ${lib.escapeShellArg nodedir} ]; then
|
if [ ! -d ${lib.escapeShellArg nodedir} ]; then
|
||||||
mkdir -p /var/db/tahoe-lafs
|
mkdir -p /var/db/tahoe-lafs
|
||||||
tahoe create-introducer ${lib.escapeShellArg nodedir}
|
# See https://github.com/NixOS/nixpkgs/issues/25273
|
||||||
|
tahoe create-introducer \
|
||||||
|
--hostname="${config.networking.hostName}" \
|
||||||
|
${lib.escapeShellArg nodedir}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Tahoe has created a predefined tahoe.cfg which we must now
|
# Tahoe has created a predefined tahoe.cfg which we must now
|
||||||
@ -334,10 +337,10 @@ in
|
|||||||
Type = "simple";
|
Type = "simple";
|
||||||
PIDFile = pidfile;
|
PIDFile = pidfile;
|
||||||
# Believe it or not, Tahoe is very brittle about the order of
|
# Believe it or not, Tahoe is very brittle about the order of
|
||||||
# arguments to $(tahoe start). The node directory must come first,
|
# arguments to $(tahoe run). The node directory must come first,
|
||||||
# and arguments which alter Twisted's behavior come afterwards.
|
# and arguments which alter Twisted's behavior come afterwards.
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile}
|
${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
preStart = ''
|
preStart = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user