diff options
| author | raeno <just.raeno@gmail.com> | 2018-12-19 22:39:44 +0400 |
|---|---|---|
| committer | raeno <just.raeno@gmail.com> | 2018-12-19 22:39:44 +0400 |
| commit | 7fb37804313339f9a2215aea27ece42e8ec31312 (patch) | |
| tree | b7438e9ecd2f4f90e171c16bacbe538cb1ef6e4e /config | |
| parent | a3003364598b42849e384a216948dad810481f51 (diff) | |
| parent | f98ee9402fcafff362ab2446f386214d7a5c41c7 (diff) | |
| download | pleroma-7fb37804313339f9a2215aea27ece42e8ec31312.tar.gz pleroma-7fb37804313339f9a2215aea27ece42e8ec31312.zip | |
Merge branch 'develop' into oembed_provider
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/config.md | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 73242e4ff..90237d136 100644 --- a/config/config.exs +++ b/config/config.exs @@ -137,8 +137,8 @@ config :pleroma, :fe, logo_mask: true, logo_margin: "0.1em", background: "/static/aurora_borealis.jpg", - redirect_root_no_login: "/main/all", - redirect_root_login: "/main/friends", + redirect_root_no_login: "/~/main/all", + redirect_root_login: "/~/main/friends", show_instance_panel: true, scope_options_enabled: false, formatting_options_enabled: false, diff --git a/config/config.md b/config/config.md index edabd6e0f..63c895753 100644 --- a/config/config.md +++ b/config/config.md @@ -174,4 +174,17 @@ Kocaptcha is a very simple captcha service with a single API endpoint, the source code is here: https://github.com/koto-bank/kocaptcha. The default endpoint `https://captcha.kotobank.ch` is hosted by the developer. -* `endpoint`: the kocaptcha endpoint to use
\ No newline at end of file +* `endpoint`: the kocaptcha endpoint to use + +## :admin_token + +Allows to set a token that can be used to authenticate with the admin api without using an actual user by giving it as the 'admin_token' parameter. Example: + +``` +config :pleroma, :admin_token, "somerandomtoken" +``` + +You can then do +``` +curl "http://localhost:4000/api/pleroma/admin/invite_token?admin_token=somerandomtoken" +``` |