netns: remove conditionals for service settings

Going without the conditionals (like in secure-node.nix) adds
readability and doesn't reduce evaluation performance (in fact, it
even slightly improves performance due to implementation details
of mkIf).

To avoid errors, remove use of disabled services in secure-node.nix and
nix-bitcoin-webindex.nix.
This commit is contained in:
Erik Arvstedt
2020-08-21 22:35:58 +02:00
parent 0f0f6ddbb9
commit d0b8d77de2
3 changed files with 15 additions and 14 deletions

View File

@@ -194,7 +194,9 @@ in {
port = 50001;
enforceTor = true;
};
services.tor.hiddenServices.electrs = mkHiddenService { port = cfg.electrs.port; toHost = cfg.electrs.address; };
services.tor.hiddenServices.electrs = mkIf cfg.electrs.enable (mkHiddenService {
port = cfg.electrs.port; toHost = cfg.electrs.address;
});
services.spark-wallet = {
onion-service = true;