limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Merge branch 'fix/pleroma-ctl-rpc' into 'develop'

Browse source 
pleroma_ctl: Fix attempting to use RPC for config generation

See merge request pleroma/pleroma!1862
This commit is contained in:
rinpatch 2019-10-18 21:40:07 +00:00
commit 0341f6f779
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -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` - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
</details> </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 ## [1.1.1] - 2019-10-18
### Fixed ### 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: - 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:

4
rel/files/bin/pleroma_ctl
View file

@ -141,8 +141,8 @@ else
ACTION="$1" ACTION="$1"
shift shift
echo "$1" | grep "^-" >/dev/null
if [ "$(echo \"$1\" | grep \"^-\" >/dev/null)" = false ]; then if [ $? -eq 1 ]; then
SUBACTION="$1" SUBACTION="$1"
shift shift
fi fi