diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-19 00:37:39 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-19 00:41:26 +0300 |
| commit | 59d447d5558ee88fa1ad479b87d14b7276547fb8 (patch) | |
| tree | 201a2106aa0e7d9c38a97182c07653732eae84d8 | |
| parent | 1a063c92ab5e3454a5333cb8b5db7d405be166e2 (diff) | |
| download | pleroma-59d447d5558ee88fa1ad479b87d14b7276547fb8.tar.gz | |
pleroma_ctl: Fix attempting to use RPC for config generation
| -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 758d53ec4..afbe7f91b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [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 |