From 9730be9282a96ee32305384fcf8749a21acf1f6f Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 27 Aug 2021 17:06:17 +0200
Subject: [PATCH] joinmarket-yieldgenerator: simplify start script

---
 modules/joinmarket.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
index 506628e..59fd2d0 100644
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@@ -312,21 +312,15 @@ in {
       wantedBy = [ "joinmarket.service" ];
       requires = [ "joinmarket.service" ];
       after = [ "joinmarket.service" ];
-      preStart = let
-        start = ''
-          exec ${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
+      script = ''
+        tr -d "\n" <"${secretsDir}/jm-wallet-password" \
+        | ${nbPkgs.joinmarket}/bin/jm-yg-privacyenhanced --datadir='${cfg.dataDir}' \
+          --wallet-password-stdin wallet.jmdat
       '';
       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
-        ExecStart = "${pkgs.bash}/bin/bash /run/${RuntimeDirectory}/start";
         # 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
         SyslogIdentifier = "joinmarket-yieldgenerator";
         User = cfg.user;