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

spark-wallet, lightning-charge: specify mainchain network in clightning data dir

Browse Source 
This fixes warnings in each service.
This commit is contained in:
Erik Arvstedt 2020-01-09 14:27:46 +01:00 committed by Jonas Nick
parent eaaa6b8701
commit 6fe647ecc4
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/lightning-charge.nix
View File

@ -31,7 +31,7 @@ in {
after = [ "clightning.service" ]; after = [ "clightning.service" ];
serviceConfig = { serviceConfig = {
EnvironmentFile = "${config.nix-bitcoin.secretsDir}/lightning-charge-env"; 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, # Unfortunately c-lightning doesn't allow setting the permissions of the rpc socket,
# so this must run as the clightning user # so this must run as the clightning user
# https://github.com/ElementsProject/lightning/issues/1366 # https://github.com/ElementsProject/lightning/issues/1366

4
modules/spark-wallet.nix
View File

@ -32,9 +32,9 @@ in {
}; };
ln-path = mkOption { ln-path = mkOption {
type = types.path; type = types.path;
default = "/var/lib/clightning"; default = "${config.services.clightning.dataDir}/bitcoin";
description = '' description = ''
"The path of the clightning data directory."; "The path of the clightning network data directory.";
''; '';
}; };
onion-service = mkOption { onion-service = mkOption {