diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-18 21:40:07 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-18 21:40:07 +0000 |
| commit | 0341f6f779fa60a55eb824507930691b0894d181 (patch) | |
| tree | 6c6bbb18403cae8cba81e402001fd782e468a5ad | |
| parent | c25a81b173a2c188d5ffc55bf5aa56281a084066 (diff) | |
| parent | 901bf0fb8c5407a3e74bc782e8eb28eb47dab6ef (diff) | |
| download | pleroma-0341f6f779fa60a55eb824507930691b0894d181.tar.gz | |
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
pleroma_ctl: Fix attempting to use RPC for config generation
See merge request pleroma/pleroma!1862
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rwxr-xr-x | rel/files/bin/pleroma_ctl | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1135ccb62..d516080b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,6 +74,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname` </details> +## [1.1.2] - 2019-10-18 +### Fixed +- `pleroma_ctl` trying to connect to a running instance when generating the config, which of course doesn't exist. + ## [1.1.1] - 2019-10-18 ### Fixed - One of the migrations between 1.0.0 and 1.1.0 wiping user info of the relay user because of unexpected behavior of postgresql's `jsonb_set`, resulting in inability to post in the default configuration. If you were affected, please run the following query in postgres console, the relay user will be recreated automatically: diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl index 90f87a990..9fc5b0bad 100755 --- a/rel/files/bin/pleroma_ctl +++ b/rel/files/bin/pleroma_ctl @@ -141,8 +141,8 @@ else ACTION="$1" shift - - if [ "$(echo \"$1\" | grep \"^-\" >/dev/null)" = false ]; then + echo "$1" | grep "^-" >/dev/null + if [ $? -eq 1 ]; then SUBACTION="$1" shift fi |