diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-11 17:55:42 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-11 17:59:01 +0100 |
| commit | d44535d8189ec2f0e77d445804cca60b869b24a1 (patch) | |
| tree | 969e278246b441e2ce63bdffb852efbfbe5d6542 | |
| parent | 37ffa16933953565dcab5c0d7e0ee1ebb6e349c3 (diff) | |
| parent | 3121d76ba11043ea5c4e957ac0c3edbf21d1e84d (diff) | |
Merge #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 #11830.
Tree-SHA512: cd71c2a4043ef1381d3810b057cc83be3fac612df576b91b683ef91fdb7998c534b3b97a3313845eb867dc4bf7cc42a1250474d2261ab3f9ed2f884ca8ebd9f4
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/debian/examples/bitcoin.conf | 4 | ||||
| -rw-r--r-- | doc/release-notes.md | 6 | ||||
| -rw-r--r-- | share/rpcauth/README.md | 10 | ||||
| -rwxr-xr-x | share/rpcauth/rpcauth.py (renamed from share/rpcuser/rpcuser.py) | 0 | ||||
| -rw-r--r-- | share/rpcuser/README.md | 10 |
6 files changed, 19 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 9b791cc0e8..31525e2c66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,7 @@ DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \ $(top_srcdir)/contrib/rpm DIST_SHARE = \ $(top_srcdir)/share/genbuild.sh \ - $(top_srcdir)/share/rpcuser + $(top_srcdir)/share/rpcauth BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \ $(top_srcdir)/contrib/devtools/security-check.py diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf index 14a59fdf6b..4dd73162a2 100644 --- a/contrib/debian/examples/bitcoin.conf +++ b/contrib/debian/examples/bitcoin.conf @@ -77,9 +77,9 @@ #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593 # # The second method `rpcauth` can be added to server startup argument. It is set at initialization time -# using the output from the script in share/rpcuser/rpcuser.py after providing a username: +# using the output from the script in share/rpcauth/rpcauth.py after providing a username: # -# ./share/rpcuser/rpcuser.py alice +# ./share/rpcauth/rpcauth.py alice # String to be appended to bitcoin.conf: # rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae # Your password: diff --git a/doc/release-notes.md b/doc/release-notes.md index 43009b0813..78caddc8f0 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -94,6 +94,12 @@ Changed command-line options ----------------------------- - `-debuglogfile=<file>` can be used to specify an alternative debug logging file. +Renamed script for creating JSON-RPC credentials +----------------------------- +The `share/rpcuser/rpcuser.py` script was renamed to `share/rpcauth/rpcauth.py`. This script can be +used to create `rpcauth` credentials for a JSON-RPC user. + + Credits ======= diff --git a/share/rpcauth/README.md b/share/rpcauth/README.md new file mode 100644 index 0000000000..389278a125 --- /dev/null +++ b/share/rpcauth/README.md @@ -0,0 +1,10 @@ +RPC Tools +--------------------- + +### [RPCAuth](/share/rpcauth) ### + +Create login credentials for a JSON-RPC user. + +Usage: + + ./rpcauth.py <username> diff --git a/share/rpcuser/rpcuser.py b/share/rpcauth/rpcauth.py index 6d9b44f699..6d9b44f699 100755 --- a/share/rpcuser/rpcuser.py +++ b/share/rpcauth/rpcauth.py diff --git a/share/rpcuser/README.md b/share/rpcuser/README.md deleted file mode 100644 index 12a8e6fb0c..0000000000 --- a/share/rpcuser/README.md +++ /dev/null @@ -1,10 +0,0 @@ -RPC Tools ---------------------- - -### [RPCUser](/share/rpcuser) ### - -Create an RPC user login credential. - -Usage: - - ./rpcuser.py <username> |