Skip to content

Commit d44535d

Browse files
committed
Merge bitcoin#11836: Rename rpcuser.py to rpcauth.py
3121d76 doc: Update release notes for share/rpcauth/rpcauth.py rename (Henrik Jonsson) 3fdb297 Rename rpcuser.py to rpcauth.py (Henrik Jonsson) Pull request description: This script creates `rpcauth` entries for bitcoin.conf, not the deprecated `rpcuser` entry, so this changes the name of the script to match. As discussed in bitcoin#11830. Tree-SHA512: cd71c2a4043ef1381d3810b057cc83be3fac612df576b91b683ef91fdb7998c534b3b97a3313845eb867dc4bf7cc42a1250474d2261ab3f9ed2f884ca8ebd9f4
2 parents 37ffa16 + 3121d76 commit d44535d

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed

Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \
4646
$(top_srcdir)/contrib/rpm
4747
DIST_SHARE = \
4848
$(top_srcdir)/share/genbuild.sh \
49-
$(top_srcdir)/share/rpcuser
49+
$(top_srcdir)/share/rpcauth
5050

5151
BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
5252
$(top_srcdir)/contrib/devtools/security-check.py

contrib/debian/examples/bitcoin.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
7878
#
7979
# The second method `rpcauth` can be added to server startup argument. It is set at initialization time
80-
# using the output from the script in share/rpcuser/rpcuser.py after providing a username:
80+
# using the output from the script in share/rpcauth/rpcauth.py after providing a username:
8181
#
82-
# ./share/rpcuser/rpcuser.py alice
82+
# ./share/rpcauth/rpcauth.py alice
8383
# String to be appended to bitcoin.conf:
8484
# rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
8585
# Your password:

doc/release-notes.md

+6
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ Changed command-line options
9494
-----------------------------
9595
- `-debuglogfile=<file>` can be used to specify an alternative debug logging file.
9696

97+
Renamed script for creating JSON-RPC credentials
98+
-----------------------------
99+
The `share/rpcuser/rpcuser.py` script was renamed to `share/rpcauth/rpcauth.py`. This script can be
100+
used to create `rpcauth` credentials for a JSON-RPC user.
101+
102+
97103
Credits
98104
=======
99105

share/rpcauth/README.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
RPC Tools
2+
---------------------
3+
4+
### [RPCAuth](/share/rpcauth) ###
5+
6+
Create login credentials for a JSON-RPC user.
7+
8+
Usage:
9+
10+
./rpcauth.py <username>
File renamed without changes.

share/rpcuser/README.md

-10
This file was deleted.

0 commit comments

Comments
 (0)