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

liquid: move rpcuser definition to module

Browse Source
This commit is contained in:
Erik Arvstedt 2021-01-14 13:24:30 +01:00
parent 0e00c39d47
commit 757a66b9bd
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/liquid.nix
View File

@ -30,7 +30,7 @@ let
rpcbind=${cfg.rpc.address} rpcbind=${cfg.rpc.address}
rpcconnect=${cfg.rpc.address} rpcconnect=${cfg.rpc.address}
${lib.concatMapStrings (rpcallowip: "rpcallowip=${rpcallowip}\n") cfg.rpcallowip} ${lib.concatMapStrings (rpcallowip: "rpcallowip=${rpcallowip}\n") cfg.rpcallowip}
${optionalString (cfg.rpcuser != null) "rpcuser=${cfg.rpcuser}"} rpcuser=${cfg.rpcuser}
${optionalString (cfg.rpcpassword != null) "rpcpassword=${cfg.rpcpassword}"} ${optionalString (cfg.rpcpassword != null) "rpcpassword=${cfg.rpcpassword}"}
mainchainrpchost=${config.services.bitcoind.rpc.address} mainchainrpchost=${config.services.bitcoind.rpc.address}
mainchainrpcport=${toString config.services.bitcoind.rpc.port} mainchainrpcport=${toString config.services.bitcoind.rpc.port}
@ -138,8 +138,8 @@ in {
''; '';
}; };
rpcuser = mkOption { rpcuser = mkOption {
type = types.nullOr types.str; type = types.str;
default = null; default = "liquidrpc";
description = "Username for JSON-RPC connections"; description = "Username for JSON-RPC connections";
}; };
rpcpassword = mkOption { rpcpassword = mkOption {

1
modules/presets/secure-node.nix
View File

@ -48,7 +48,6 @@ in {
}; };
services.liquidd = { services.liquidd = {
rpcuser = "liquidrpc";
prune = 1000; prune = 1000;
validatepegin = true; validatepegin = true;
listen = true; listen = true;