From 1848c3dd983078e145c2f6a449f61d2e6be55024 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 1 Oct 2021 11:51:56 +0200
Subject: [PATCH] btcpayserver: minor improvements

- Quote datadir
- Extract liquidd service variable
- Move btcpayserver below liquid in modules list because it depends
  on liquid
---
 modules/btcpayserver.nix | 14 +++++++-------
 modules/modules.nix      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/btcpayserver.nix b/modules/btcpayserver.nix
index aa2422f..786aaf9 100644
--- a/modules/btcpayserver.nix
+++ b/modules/btcpayserver.nix
@@ -101,7 +101,7 @@ let
   nbLib = config.nix-bitcoin.lib;
   nbPkgs = config.nix-bitcoin.pkgs;
 
-  bitcoind = config.services.bitcoind;
+  inherit (config.services) bitcoind liquidd;
 in {
   inherit options;
 
@@ -149,9 +149,9 @@ in {
         port=${toString cfg.nbxplorer.port}
         ${optionalString cfg.btcpayserver.lbtc ''
           chains=btc,lbtc
-          lbtcrpcuser=${cfg.liquidd.rpcuser}
-          lbtcrpcurl=http://${cfg.liquidd.rpc.address}:${toString cfg.liquidd.rpc.port}
-          lbtcnodeendpoint=${cfg.liquidd.address}:${toString cfg.liquidd.port}
+          lbtcrpcuser=${liquidd.rpcuser}
+          lbtcrpcurl=http://${liquidd.rpc.address}:${toString liquidd.rpc.port}
+          lbtcnodeendpoint=${liquidd.address}:${toString liquidd.port}
         ''}
       '';
     in {
@@ -221,8 +221,8 @@ in {
       '';
       serviceConfig = nbLib.defaultHardening // {
         ExecStart = ''
-          ${cfg.btcpayserver.package}/bin/btcpayserver --conf=${cfg.btcpayserver.dataDir}/settings.config \
-            --datadir=${cfg.btcpayserver.dataDir}
+          ${cfg.btcpayserver.package}/bin/btcpayserver --conf='${cfg.btcpayserver.dataDir}/settings.config' \
+            --datadir='${cfg.btcpayserver.dataDir}'
         '';
         User = cfg.btcpayserver.user;
         Restart = "on-failure";
@@ -236,7 +236,7 @@ in {
       isSystemUser = true;
       group = cfg.nbxplorer.group;
       extraGroups = [ "bitcoinrpc-public" ]
-                    ++ optional cfg.btcpayserver.lbtc cfg.liquidd.group;
+                    ++ optional cfg.btcpayserver.lbtc liquidd.group;
       home = cfg.nbxplorer.dataDir;
     };
     users.groups.${cfg.nbxplorer.group} = {};
diff --git a/modules/modules.nix b/modules/modules.nix
index 0e0ac5a..97c263a 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -18,9 +18,9 @@
     ./lightning-loop.nix
     ./lightning-pool.nix
     ./charge-lnd.nix
-    ./btcpayserver.nix
     ./electrs.nix
     ./liquid.nix
+    ./btcpayserver.nix
     ./joinmarket.nix
     ./joinmarket-ob-watcher.nix
     ./hardware-wallets.nix