From 07316dda2c37e2f2d05011a7ce2e6808129b23f3 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 11 Dec 2017 17:55:42 +0100 Subject: [PATCH] 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 --- Makefile.am | 2 +- contrib/debian/examples/dash.conf | 4 ++-- doc/release-notes.md | 6 ++++++ share/rpcauth/README.md | 10 ++++++++++ share/{rpcuser/rpcuser.py => rpcauth/rpcauth.py} | 0 share/rpcuser/README.md | 10 ---------- 6 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 share/rpcauth/README.md rename share/{rpcuser/rpcuser.py => rpcauth/rpcauth.py} (100%) delete mode 100644 share/rpcuser/README.md diff --git a/Makefile.am b/Makefile.am index fcd57b75e5..ede9513498 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,7 +45,7 @@ DIST_CONTRIB = $(top_srcdir)/contrib/dash-cli.bash-completion \ $(top_srcdir)/contrib/init 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/dash.conf b/contrib/debian/examples/dash.conf index 8459b31d0e..221aa71e86 100644 --- a/contrib/debian/examples/dash.conf +++ b/contrib/debian/examples/dash.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 dash.conf: # rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae # Your password: diff --git a/doc/release-notes.md b/doc/release-notes.md index fbb7448ce5..b584090d6b 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -465,6 +465,12 @@ See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.14.0.5. - [`32aa229c7`](https://github.com/dashpay/dash/commit/32aa229c7) Reorganize Dash Specific code into folders (#2753) - [`acbf0a221`](https://github.com/dashpay/dash/commit/acbf0a221) Bump version to 0.14.1 (#2928) +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 diff --git a/share/rpcuser/rpcuser.py b/share/rpcauth/rpcauth.py similarity index 100% rename from share/rpcuser/rpcuser.py rename to 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