mirror of
https://github.com/fort-nix/nix-bitcoin.git
synced 2024-11-30 03:32:05 +03:00
minor fixes
- bitcoind: Remove obsolete defaultText - clightning: Fix description Option `address` can't be used to specify a socket path because it's used explicitly as an IP address in many places. - lnd: Break up overlong line This is required by commit `services: support 0.0.0.0/:: in `address` options` - nix-bitcoin.nix: Formatting - secrets: Improve descriptions
This commit is contained in:
parent
e86d1ff0ff
commit
e561637600
@ -26,7 +26,6 @@ let
|
|||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = config.nix-bitcoin.pkgs.bitcoind;
|
default = config.nix-bitcoin.pkgs.bitcoind;
|
||||||
defaultText = "pkgs.blockchains.bitcoind";
|
|
||||||
description = "The package providing bitcoin binaries.";
|
description = "The package providing bitcoin binaries.";
|
||||||
};
|
};
|
||||||
extraConfig = mkOption {
|
extraConfig = mkOption {
|
||||||
|
@ -7,7 +7,7 @@ let
|
|||||||
address = mkOption {
|
address = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "127.0.0.1";
|
default = "127.0.0.1";
|
||||||
description = "IP address or UNIX domain socket to listen for peer connections.";
|
description = "Address to listen for peer connections.";
|
||||||
};
|
};
|
||||||
port = mkOption {
|
port = mkOption {
|
||||||
type = types.port;
|
type = types.port;
|
||||||
|
@ -221,7 +221,9 @@ in {
|
|||||||
in [
|
in [
|
||||||
(nbLib.script "lnd-create-wallet" ''
|
(nbLib.script "lnd-create-wallet" ''
|
||||||
attempts=250
|
attempts=250
|
||||||
while ! { exec 3>/dev/tcp/${cfg.restAddress}/${toString cfg.restPort} && exec 3>&-; } &>/dev/null; do
|
while ! {
|
||||||
|
exec 3>/dev/tcp/${cfg.restAddress}/${toString cfg.restPort} && exec 3>&-
|
||||||
|
} &>/dev/null; do
|
||||||
((attempts-- == 0)) && { echo "lnd REST service unreachable"; exit 1; }
|
((attempts-- == 0)) && { echo "lnd REST service unreachable"; exit 1; }
|
||||||
sleep 0.1
|
sleep 0.1
|
||||||
done
|
done
|
||||||
|
@ -16,7 +16,7 @@ with lib;
|
|||||||
|
|
||||||
torClientAddressWithPort = mkOption {
|
torClientAddressWithPort = mkOption {
|
||||||
readOnly = true;
|
readOnly = true;
|
||||||
default = with config.services.tor.client.socksListenAddress;
|
default = with config.services.tor.client.socksListenAddress;
|
||||||
"${addr}:${toString port}";
|
"${addr}:${toString port}";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -13,7 +13,8 @@ let
|
|||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
description = ''
|
description = ''
|
||||||
Set permissions for existing secrets in `nix-bitcoin.secretsDir`.
|
Set permissions for existing secrets in `nix-bitcoin.secretsDir`
|
||||||
|
before services are started.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -21,7 +22,7 @@ let
|
|||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
description = ''
|
description = ''
|
||||||
Automatically generate all required secrets at system startup.
|
Automatically generate all required secrets before services are started.
|
||||||
Note: Make sure to create a backup of the generated secrets.
|
Note: Make sure to create a backup of the generated secrets.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user