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

btcpayserver: minor improvements

Browse Source 
- Quote datadir
- Extract liquidd service variable
- Move btcpayserver below liquid in modules list because it depends
  on liquid
This commit is contained in:
Erik Arvstedt 2021-10-01 11:51:56 +02:00
parent e561637600
commit 1848c3dd98
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/btcpayserver.nix
View File

@ -101,7 +101,7 @@ let
nbLib = config.nix-bitcoin.lib; nbLib = config.nix-bitcoin.lib;
nbPkgs = config.nix-bitcoin.pkgs; nbPkgs = config.nix-bitcoin.pkgs;
bitcoind = config.services.bitcoind; inherit (config.services) bitcoind liquidd;
in { in {
inherit options; inherit options;
@ -149,9 +149,9 @@ in {
port=${toString cfg.nbxplorer.port} port=${toString cfg.nbxplorer.port}
${optionalString cfg.btcpayserver.lbtc '' ${optionalString cfg.btcpayserver.lbtc ''
chains=btc,lbtc chains=btc,lbtc
lbtcrpcuser=${cfg.liquidd.rpcuser} lbtcrpcuser=${liquidd.rpcuser}
lbtcrpcurl=http://${cfg.liquidd.rpc.address}:${toString cfg.liquidd.rpc.port} lbtcrpcurl=http://${liquidd.rpc.address}:${toString liquidd.rpc.port}
lbtcnodeendpoint=${cfg.liquidd.address}:${toString cfg.liquidd.port} lbtcnodeendpoint=${liquidd.address}:${toString liquidd.port}
''} ''}
''; '';
in { in {
@ -221,8 +221,8 @@ in {
''; '';
serviceConfig = nbLib.defaultHardening // { serviceConfig = nbLib.defaultHardening // {
ExecStart = '' ExecStart = ''
${cfg.btcpayserver.package}/bin/btcpayserver --conf=${cfg.btcpayserver.dataDir}/settings.config \ ${cfg.btcpayserver.package}/bin/btcpayserver --conf='${cfg.btcpayserver.dataDir}/settings.config' \
--datadir=${cfg.btcpayserver.dataDir} --datadir='${cfg.btcpayserver.dataDir}'
''; '';
User = cfg.btcpayserver.user; User = cfg.btcpayserver.user;
Restart = "on-failure"; Restart = "on-failure";
@ -236,7 +236,7 @@ in {
isSystemUser = true; isSystemUser = true;
group = cfg.nbxplorer.group; group = cfg.nbxplorer.group;
extraGroups = [ "bitcoinrpc-public" ] extraGroups = [ "bitcoinrpc-public" ]
++ optional cfg.btcpayserver.lbtc cfg.liquidd.group; ++ optional cfg.btcpayserver.lbtc liquidd.group;
home = cfg.nbxplorer.dataDir; home = cfg.nbxplorer.dataDir;
}; };
users.groups.${cfg.nbxplorer.group} = {}; users.groups.${cfg.nbxplorer.group} = {};

2
modules/modules.nix
View File

@ -18,9 +18,9 @@
./lightning-loop.nix ./lightning-loop.nix
./lightning-pool.nix ./lightning-pool.nix
./charge-lnd.nix ./charge-lnd.nix
./btcpayserver.nix
./electrs.nix ./electrs.nix
./liquid.nix ./liquid.nix
./btcpayserver.nix
./joinmarket.nix ./joinmarket.nix
./joinmarket-ob-watcher.nix ./joinmarket-ob-watcher.nix
./hardware-wallets.nix ./hardware-wallets.nix