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

bitcoind: set onionPort in bitcoind module

Browse Source 
This removes the module-level dependency from onion-services to
bitcoind.
Due to the `or false` fallback, there's no dependency added in
the reverse direction.

In particular, this allows us to not add a dependency on liquidd in
the following commit.
This commit is contained in:
Erik Arvstedt 2021-10-28 22:23:24 +02:00
parent 20d4240919
commit cc3d43f4e9
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/bitcoind.nix
View File

@ -17,7 +17,9 @@ let
};
onionPort = mkOption {
type = types.nullOr types.port;
default = null;
# When the bitcoind onion service is enabled, add an onion-tagged socket
# to distinguish local connections from Tor connections
default = if (config.nix-bitcoin.onionServices.bitcoind.enable or false) then 8334 else null;
description = ''
Port to listen for Tor peer connections.
If set, inbound connections to this port are tagged as onion peers.

4
modules/onion-services.nix
View File

@ -118,10 +118,6 @@ in {
externalPort = 80;
};
};
# When the bitcoind onion service is enabled, add an onion-tagged socket
# to distinguish local connections from Tor connections
services.bitcoind.onionPort = mkIf (cfg.bitcoind.enable or false) 8334;
}
];
}