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

Remove mentions of electrs in the bitcoind module, set sysperms & disablewallet only when electrs is enabled, electrs enabled in "all" setting, remove 

unnecessary newline, make sysperms & disablewallet optional
This commit is contained in:
nixbitcoin 2019-03-21 11:27:28 +01:00
parent eacd057963
commit fca4af59ac
No known key found for this signature in database
GPG Key ID: DD11F9AD5308B3BA
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/bitcoind.nix
View File

@ -9,9 +9,8 @@ let
${optionalString cfg.testnet "testnet=1"}
${optionalString (cfg.dbCache != null) "dbcache=${toString cfg.dbCache}"}
${optionalString (cfg.prune != null) "prune=${toString cfg.prune}"}
sysperms=${if cfg.sysperms then "1" else "0"}
disablewallet=${if cfg.disablewallet then "1" else "0"}
${optionalString (cfg.sysperms != null) "sysperms=${if cfg.sysperms then "1" else "0"}"}
${optionalString (cfg.disablewallet != null) "disablewallet=${if cfg.disablewallet then "1" else "0"}"}
# Connection options
${optionalString (cfg.port != null) "port=${toString cfg.port}"}
@ -155,19 +154,17 @@ in {
'';
};
sysperms = mkOption {
type = types.bool;
default = false;
type = types.nullOr types.bool;
default = null;
description = ''
Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)
# Necessary for electrs
'';
};
disablewallet = mkOption {
type = types.bool;
default = false;
type = types.nullOr types.bool;
default = null;
description = ''
Do not load the wallet and disable wallet RPC calls
# Necessary for electrs
'';
};
dbCache = mkOption {

6
modules/nix-bitcoin.nix
View File

@ -78,8 +78,8 @@ in {
# bitcoind
services.bitcoind.enable = true;
services.bitcoind.listen = true;
services.bitcoind.sysperms = true;
services.bitcoind.disablewallet = true;
services.bitcoind.sysperms = if config.services.electrs.enable then true else null;
services.bitcoind.disablewallet = if config.services.electrs.enable then true else null;
services.bitcoind.proxy = config.services.tor.client.socksListenAddress;
services.bitcoind.port = 8333;
services.bitcoind.rpcuser = "bitcoinrpc";
@ -164,7 +164,7 @@ in {
}];
version = 3;
};
services.electrs.enable = true;
services.electrs.enable = cfg.modules == "all";
services.electrs.high-memory = false;
services.tor.hiddenServices.electrs = {
map = [{