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

bitcoind: remove custom rpc user names 

Simpler.
We've just removed option 'bitcoind.rpcuser', so we can also remove the
old name 'bitcoinrpc'.
This commit is contained in:
Erik Arvstedt 2020-08-26 21:15:36 +02:00
parent 1408403dec
commit 9d610991be
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bitcoind.nix
View File

@ -290,11 +290,9 @@ in {
}) })
{ {
rpc.users.privileged = { rpc.users.privileged = {
name = "bitcoinrpc";
passwordHMACFromFile = true; passwordHMACFromFile = true;
}; };
rpc.users.public = { rpc.users.public = {
name = "publicrpc";
passwordHMACFromFile = true; passwordHMACFromFile = true;
rpcwhitelist = import ./bitcoind-rpc-public-whitelist.nix; rpcwhitelist = import ./bitcoind-rpc-public-whitelist.nix;
}; };

4
test/base.py
View File

@ -50,10 +50,10 @@ def run_tests(extra_tests):
machine.wait_until_succeeds("su operator -c 'bitcoin-cli help'") machine.wait_until_succeeds("su operator -c 'bitcoin-cli help'")
# Restating rpcuser & rpcpassword overrides privileged credentials # Restating rpcuser & rpcpassword overrides privileged credentials
machine.fail( machine.fail(
"bitcoin-cli -rpcuser=publicrpc -rpcpassword=$(cat /secrets/bitcoin-rpcpassword-public) help" "bitcoin-cli -rpcuser=public -rpcpassword=$(cat /secrets/bitcoin-rpcpassword-public) help"
) )
machine.wait_until_succeeds( machine.wait_until_succeeds(
log_has_string("bitcoind", "RPC User publicrpc not allowed to call method help") log_has_string("bitcoind", "RPC User public not allowed to call method help")
) )
assert_running("electrs") assert_running("electrs")