From 6fe647ecc45f2637dfd5f708c83c01a70e2edc4f Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 9 Jan 2020 14:27:46 +0100
Subject: [PATCH] spark-wallet, lightning-charge: specify mainchain network in
 clightning data dir

This fixes warnings in each service.
---
 modules/lightning-charge.nix | 2 +-
 modules/spark-wallet.nix     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/lightning-charge.nix b/modules/lightning-charge.nix
index 5f43ed0..0d0061a 100644
--- a/modules/lightning-charge.nix
+++ b/modules/lightning-charge.nix
@@ -31,7 +31,7 @@ in {
       after = [ "clightning.service" ];
       serviceConfig = {
           EnvironmentFile = "${config.nix-bitcoin.secretsDir}/lightning-charge-env";
-          ExecStart = "${pkgs.nix-bitcoin.lightning-charge}/bin/charged -l ${config.services.clightning.dataDir} -d ${config.services.clightning.dataDir}/lightning-charge.db";
+          ExecStart = "${pkgs.nix-bitcoin.lightning-charge}/bin/charged -l ${config.services.clightning.dataDir}/bitcoin -d ${config.services.clightning.dataDir}/lightning-charge.db";
           # Unfortunately c-lightning doesn't allow setting the permissions of the rpc socket,
           # so this must run as the clightning user
           # https://github.com/ElementsProject/lightning/issues/1366
diff --git a/modules/spark-wallet.nix b/modules/spark-wallet.nix
index bef8d45..c1565ea 100644
--- a/modules/spark-wallet.nix
+++ b/modules/spark-wallet.nix
@@ -32,9 +32,9 @@ in {
     };
     ln-path = mkOption {
       type = types.path;
-      default = "/var/lib/clightning";
+      default = "${config.services.clightning.dataDir}/bitcoin";
       description = ''
-        "The path of the clightning data directory.";
+        "The path of the clightning network data directory.";
       '';
     };
     onion-service = mkOption {