From 09c13d0929f9f0d4b674c38fb9f802a24346f2a4 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Mon, 10 Dec 2018 01:22:50 +0300 Subject: Use "~" as a route namespace symbol on FE --- config/config.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 8d2fdd40d..0f30b2985 100644 --- a/config/config.exs +++ b/config/config.exs @@ -119,8 +119,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, -- cgit v1.2.3 From f3eb414e282dd0e3bd5c60838e45c69cf21541e4 Mon Sep 17 00:00:00 2001 From: lain Date: Tue, 18 Dec 2018 21:08:52 +0100 Subject: Add a way to use the admin api without a user. --- config/config.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'config') 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" +``` -- cgit v1.2.3