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

bitcoind: support onion address announcing

Browse Source
This commit is contained in:
Erik Arvstedt 2021-01-30 10:47:06 +01:00
parent 9662c19ab1
commit 332d0e70c8
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/configuration.nix
View File

@ -28,6 +28,10 @@
# LND and electrs are not compatible with pruning. # LND and electrs are not compatible with pruning.
# services.bitcoind.prune = 100000; # services.bitcoind.prune = 100000;
# #
# Set this to accounce the onion service address to peers.
# The onion service allows accepting incoming connections via Tor.
# nix-bitcoin.onionServices.bitcoind.public = true;
#
# You can add options that are not defined in modules/bitcoind.nix as follows # You can add options that are not defined in modules/bitcoind.nix as follows
# services.bitcoind.extraConfig = '' # services.bitcoind.extraConfig = ''
# maxorphantx=110 # maxorphantx=110

12
modules/bitcoind.nix
View File

@ -67,6 +67,14 @@ in {
default = 8333; default = 8333;
description = "Port to listen for peer connections."; description = "Port to listen for peer connections.";
}; };
getPublicAddressCmd = mkOption {
type = types.str;
default = "";
description = ''
Bash expression which outputs the public service address to announce to peers.
If left empty, no address is announced.
'';
};
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = config.nix-bitcoin.pkgs.bitcoind; default = config.nix-bitcoin.pkgs.bitcoind;
@ -328,6 +336,10 @@ in {
${extraRpcauth} ${extraRpcauth}
${/* Enable bitcoin-cli for group 'bitcoin' */ ""} ${/* Enable bitcoin-cli for group 'bitcoin' */ ""}
printf "rpcuser=${cfg.rpc.users.privileged.name}\nrpcpassword="; cat "${secretsDir}/bitcoin-rpcpassword-privileged"; printf "rpcuser=${cfg.rpc.users.privileged.name}\nrpcpassword="; cat "${secretsDir}/bitcoin-rpcpassword-privileged";
echo
${optionalString (cfg.getPublicAddressCmd != "") ''
echo "externalip=$(${cfg.getPublicAddressCmd})"
''}
) )
confFile='${cfg.dataDir}/bitcoin.conf' confFile='${cfg.dataDir}/bitcoin.conf'
if [[ ! -e $confFile || $cfg != $(cat $confFile) ]]; then if [[ ! -e $confFile || $cfg != $(cat $confFile) ]]; then