greg
/
nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

joinmarket-yieldgenerator: simplify start script

This commit is contained in:
Erik Arvstedt 2021-08-27 17:06:17 +02:00
parent 179b86d19c
commit 9730be9282
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/joinmarket.nix
View File

@ -312,21 +312,15 @@ in {
wantedBy = [ "joinmarket.service" ]; wantedBy = [ "joinmarket.service" ];
requires = [ "joinmarket.service" ]; requires = [ "joinmarket.service" ];
after = [ "joinmarket.service" ]; after = [ "joinmarket.service" ];
preStart = let script = ''
start = '' tr -d "\n" <"${secretsDir}/jm-wallet-password" \
exec ${nbPkgs.joinmarket}/bin/jm-yg-privacyenhanced --datadir='${cfg.dataDir}' --wallet-password-stdin wallet.jmdat | ${nbPkgs.joinmarket}/bin/jm-yg-privacyenhanced --datadir='${cfg.dataDir}' \
''; --wallet-password-stdin wallet.jmdat
in ''
pw=$(cat "${secretsDir}"/jm-wallet-password)
echo "echo -n $pw | ${start}" > $RUNTIME_DIRECTORY/start
''; '';
serviceConfig = nbLib.defaultHardening // rec { serviceConfig = nbLib.defaultHardening // rec {
RuntimeDirectory = "joinmarket-yieldgenerator"; # Only used to create start script
RuntimeDirectoryMode = "700";
WorkingDirectory = cfg.dataDir; # The service creates dir 'logs' in the working dir WorkingDirectory = cfg.dataDir; # The service creates dir 'logs' in the working dir
ExecStart = "${pkgs.bash}/bin/bash /run/${RuntimeDirectory}/start";
# Show "joinmarket-yieldgenerator" instead of "bash" in the journal. # Show "joinmarket-yieldgenerator" instead of "bash" in the journal.
# The parent bash start process has to run alongside the main process # The start script has to run alongside the main process
# because it provides the wallet password via stdin to the main process # because it provides the wallet password via stdin to the main process
SyslogIdentifier = "joinmarket-yieldgenerator"; SyslogIdentifier = "joinmarket-yieldgenerator";
User = cfg.user; User = cfg.user;