From 49086abcc53f80134e5fa62cea5e5edbe9f5e8da Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 2 Nov 2021 13:07:38 +0100
Subject: [PATCH] liquidd: use systemd startup notification

---
 modules/btcpayserver.nix | 6 +++---
 modules/liquid.nix       | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/btcpayserver.nix b/modules/btcpayserver.nix
index daa9f16..5bb0f7f 100644
--- a/modules/btcpayserver.nix
+++ b/modules/btcpayserver.nix
@@ -159,10 +159,10 @@ in {
           lbtcnodeendpoint=${nbLib.addressWithPort liquidd.address bitcoind.whitelistedPort}
         ''}
       '';
-    in {
+    in rec {
       wantedBy = [ "multi-user.target" ];
-      requires = [ "bitcoind.service" ];
-      after = [ "bitcoind.service" ];
+      requires = [ "bitcoind.service" ] ++ optional cfg.btcpayserver.lbtc "liquidd.service";
+      after = requires;
       preStart = ''
         install -m 600 ${configFile} '${cfg.nbxplorer.dataDir}/settings.config'
         {
diff --git a/modules/liquid.nix b/modules/liquid.nix
index 36abe7e..2c072f8 100644
--- a/modules/liquid.nix
+++ b/modules/liquid.nix
@@ -168,6 +168,11 @@ let
   bitcoind = config.services.bitcoind;
 
   configFile = pkgs.writeText "elements.conf" ''
+    # We're already logging via journald
+    nodebuglogfile=1
+
+    startupnotify=/run/current-system/systemd/bin/systemd-notify --ready
+
     chain=${bitcoind.makeNetworkName "liquidv1" ''
       regtest
       [regtest]'' # Add [regtest] config section
@@ -253,7 +258,8 @@ in {
         } >> '${cfg.dataDir}/elements.conf'
       '';
       serviceConfig = nbLib.defaultHardening // {
-        Type = "simple";
+        Type = "notify";
+        NotifyAccess = "all";
         User = cfg.user;
         Group = cfg.group;
         ExecStart = "${nbPkgs.elementsd}/bin/elementsd -datadir='${cfg.dataDir}'";