minor improvements
- README: - Add RTL - examples/configuration.nix: - Fix comment - btcpayserver.nix: - Use nbLib.addressWithPort - Embed optionalString like the other optionalStrings - clboss.nix: - Improve description - clightning.nix: - Option `extraConfig`: Add example, improve description. - Disable `log-timestamps`. Timestamps are already logged via journald. - Simplify `preStart` script - electrs.nix: - Use `port` description wording like in other services.
This commit is contained in:
parent
8aa28da110
commit
bd275d3a9a
@ -69,6 +69,7 @@ NixOS modules ([src](modules/modules.nix))
|
|||||||
* [Lightning Pool](https://github.com/lightninglabs/pool)
|
* [Lightning Pool](https://github.com/lightninglabs/pool)
|
||||||
* [charge-lnd](https://github.com/accumulator/charge-lnd): policy-based channel fee manager
|
* [charge-lnd](https://github.com/accumulator/charge-lnd): policy-based channel fee manager
|
||||||
* [lndconnect](https://github.com/LN-Zap/lndconnect) via a REST onion service
|
* [lndconnect](https://github.com/LN-Zap/lndconnect) via a REST onion service
|
||||||
|
* [Ride The Lightning](https://github.com/Ride-The-Lightning/RTL): web interface for `lnd` and `clightning`
|
||||||
* [spark-wallet](https://github.com/shesek/spark-wallet)
|
* [spark-wallet](https://github.com/shesek/spark-wallet)
|
||||||
* [electrs](https://github.com/romanz/electrs)
|
* [electrs](https://github.com/romanz/electrs)
|
||||||
* [btcpayserver](https://github.com/btcpayserver/btcpayserver)
|
* [btcpayserver](https://github.com/btcpayserver/btcpayserver)
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
# See the comments at the top of `hardened-extended.nix` for further details.
|
# See the comments at the top of `hardened-extended.nix` for further details.
|
||||||
# <nix-bitcoin/modules/presets/hardened-extended.nix>
|
# <nix-bitcoin/modules/presets/hardened-extended.nix>
|
||||||
|
|
||||||
# FIXME: Uncomment next line to import your hardware configuration. If so,
|
# FIXME: Uncomment the next line to import your hardware configuration. If so,
|
||||||
# add the hardware configuration file to the same directory as this file.
|
# add the hardware configuration file to the same directory as this file.
|
||||||
#./hardware-configuration.nix
|
#./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
@ -186,7 +186,7 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.btcpayserver = let
|
systemd.services.btcpayserver = let
|
||||||
nbExplorerUrl = "http://${cfg.nbxplorer.address}:${toString cfg.nbxplorer.port}/";
|
nbExplorerUrl = "http://${nbLib.addressWithPort cfg.nbxplorer.address cfg.nbxplorer.port}/";
|
||||||
nbExplorerCookie = "${cfg.nbxplorer.dataDir}/${bitcoind.makeNetworkName "Main" "RegTest"}/.cookie";
|
nbExplorerCookie = "${cfg.nbxplorer.dataDir}/${bitcoind.makeNetworkName "Main" "RegTest"}/.cookie";
|
||||||
configFile = builtins.toFile "config" (''
|
configFile = builtins.toFile "config" (''
|
||||||
network=${bitcoind.network}
|
network=${bitcoind.network}
|
||||||
@ -196,7 +196,8 @@ in {
|
|||||||
btcexplorerurl=${nbExplorerUrl}
|
btcexplorerurl=${nbExplorerUrl}
|
||||||
btcexplorercookiefile=${nbExplorerCookie}
|
btcexplorercookiefile=${nbExplorerCookie}
|
||||||
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) "rootpath=${cfg.btcpayserver.rootpath}"}
|
'' + optionalString (cfg.btcpayserver.rootpath != null) ''
|
||||||
|
rootpath=${cfg.btcpayserver.rootpath}
|
||||||
'' + optionalString (cfg.btcpayserver.lightningBackend == "clightning") ''
|
'' + optionalString (cfg.btcpayserver.lightningBackend == "clightning") ''
|
||||||
btclightning=type=clightning;server=unix:///${cfg.clightning.dataDir}/bitcoin/lightning-rpc
|
btclightning=type=clightning;server=unix:///${cfg.clightning.dataDir}/bitcoin/lightning-rpc
|
||||||
'' + optionalString cfg.btcpayserver.lbtc ''
|
'' + optionalString cfg.btcpayserver.lbtc ''
|
||||||
|
@ -9,7 +9,9 @@ let cfg = config.services.clightning.plugins.clboss; in
|
|||||||
type = types.ints.positive;
|
type = types.ints.positive;
|
||||||
default = 30000;
|
default = 30000;
|
||||||
description = ''
|
description = ''
|
||||||
Specify target amount (in satoshi) that CLBOSS will leave onchain.
|
Target amount (in satoshi) that CLBOSS will leave on-chain.
|
||||||
|
clboss will only open new channels if this amount is smaller than
|
||||||
|
the funds in your clightning wallet.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
|
@ -43,7 +43,16 @@ let
|
|||||||
extraConfig = mkOption {
|
extraConfig = mkOption {
|
||||||
type = types.lines;
|
type = types.lines;
|
||||||
default = "";
|
default = "";
|
||||||
description = "Extra lines appended to the configuration file.";
|
example = ''
|
||||||
|
alias=mynode
|
||||||
|
'';
|
||||||
|
description = ''
|
||||||
|
Extra lines appended to the configuration file.
|
||||||
|
|
||||||
|
See all available options at
|
||||||
|
https://github.com/ElementsProject/lightning/blob/master/doc/lightningd-config.5.md
|
||||||
|
or by running `lightningd --help`.
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
user = mkOption {
|
user = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
@ -88,6 +97,7 @@ let
|
|||||||
bitcoin-rpcport=${toString config.services.bitcoind.rpc.port}
|
bitcoin-rpcport=${toString config.services.bitcoind.rpc.port}
|
||||||
bitcoin-rpcuser=${config.services.bitcoind.rpc.users.public.name}
|
bitcoin-rpcuser=${config.services.bitcoind.rpc.users.public.name}
|
||||||
rpc-file-mode=0660
|
rpc-file-mode=0660
|
||||||
|
log-timestamps=false
|
||||||
${cfg.extraConfig}
|
${cfg.extraConfig}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@ -123,13 +133,14 @@ in {
|
|||||||
preStart = ''
|
preStart = ''
|
||||||
# The RPC socket has to be removed otherwise we might have stale sockets
|
# The RPC socket has to be removed otherwise we might have stale sockets
|
||||||
rm -f ${cfg.networkDir}/lightning-rpc
|
rm -f ${cfg.networkDir}/lightning-rpc
|
||||||
install -m 640 ${configFile} '${cfg.dataDir}/config'
|
umask u=rw,g=r,o=
|
||||||
{
|
{
|
||||||
|
cat ${configFile}
|
||||||
echo "bitcoin-rpcpassword=$(cat ${config.nix-bitcoin.secretsDir}/bitcoin-rpcpassword-public)"
|
echo "bitcoin-rpcpassword=$(cat ${config.nix-bitcoin.secretsDir}/bitcoin-rpcpassword-public)"
|
||||||
${optionalString (cfg.getPublicAddressCmd != "") ''
|
${optionalString (cfg.getPublicAddressCmd != "") ''
|
||||||
echo "announce-addr=$(${cfg.getPublicAddressCmd}):${toString publicPort}"
|
echo "announce-addr=$(${cfg.getPublicAddressCmd}):${toString publicPort}"
|
||||||
''}
|
''}
|
||||||
} >> '${cfg.dataDir}/config'
|
} > '${cfg.dataDir}/config'
|
||||||
'';
|
'';
|
||||||
serviceConfig = nbLib.defaultHardening // {
|
serviceConfig = nbLib.defaultHardening // {
|
||||||
ExecStart = "${nbPkgs.clightning}/bin/lightningd --lightning-dir=${cfg.dataDir}";
|
ExecStart = "${nbPkgs.clightning}/bin/lightningd --lightning-dir=${cfg.dataDir}";
|
||||||
|
@ -12,7 +12,7 @@ let
|
|||||||
port = mkOption {
|
port = mkOption {
|
||||||
type = types.port;
|
type = types.port;
|
||||||
default = 50001;
|
default = 50001;
|
||||||
description = "RPC port.";
|
description = "Port to listen for RPC connections.";
|
||||||
};
|
};
|
||||||
dataDir = mkOption {
|
dataDir = mkOption {
|
||||||
type = types.path;
|
type = types.path;
|
||||||
|
Loading…
Reference in New Issue
Block a user