Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge pull request #404 from naturallaw777/fix/syntax-final

Browse Source 
fix: add missing semicolon after extraGroups in btcpayserver.nix
This commit is contained in:
Sovran Systems
2026-08-10 08:53:36 -05:00
committed by GitHub
parent 2e35539ae6 147afcc4ac
commit 5173fb3df6
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/bitcoin/btcpayserver.nix
+2 -5
View File
@@ -30,7 +30,7 @@ let
description = "The data directory for btcpayserver."; description = "The data directory for btcpayserver.";
}; };
lightningBackend = mkOption { lightningBackend = mkOption {
type = types.nullOr (types.enum [ "clightning" "lnd" ]); type = types.nullOr (types.enum [ "lnd" ]); # Sovran uses LND only
default = null; default = null;
description = "The lightning node implementation to use."; description = "The lightning node implementation to use.";
}; };
@@ -201,8 +201,6 @@ in {
postgres=User ID=${cfg.btcpayserver.user};Host=/run/postgresql;Database=btcpaydb postgres=User ID=${cfg.btcpayserver.user};Host=/run/postgresql;Database=btcpaydb
'' + optionalString (cfg.btcpayserver.rootpath != null) '' '' + optionalString (cfg.btcpayserver.rootpath != null) ''
rootpath=${cfg.btcpayserver.rootpath} rootpath=${cfg.btcpayserver.rootpath}
'' + optionalString (cfg.btcpayserver.lightningBackend == "clightning") ''
btclightning=type=clightning;server=unix:///${config.services.clightning.dataDir or "/var/lib/clightning"}/${bitcoind.makeNetworkName "bitcoin" "regtest"}/lightning-rpc
'' + optionalString (cfg.btcpayserver.lightningBackend == "lnd") '' + optionalString (cfg.btcpayserver.lightningBackend == "lnd")
( (
"btclightning=type=lnd-rest;" + "btclightning=type=lnd-rest;" +
@@ -250,8 +248,7 @@ in {
users.users.${cfg.btcpayserver.user} = { users.users.${cfg.btcpayserver.user} = {
isSystemUser = true; isSystemUser = true;
group = cfg.btcpayserver.group; group = cfg.btcpayserver.group;
extraGroups = [ cfg.nbxplorer.group ] extraGroups = [ cfg.nbxplorer.group ];
++ optional (cfg.btcpayserver.lightningBackend == "clightning" && config.services ? clightning) (config.services.clightning.user or "clightning");
home = cfg.btcpayserver.dataDir; home = cfg.btcpayserver.dataDir;
}; };
users.groups.${cfg.btcpayserver.group} = {}; users.groups.${cfg.btcpayserver.group} = {};