diff options
author | feld <feld@feld.me> | 2020-01-22 17:13:17 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2020-01-22 17:13:17 +0000 |
commit | be2777715650d0ac80509f0bd22b4cea8641f9b3 (patch) | |
tree | d0ed95ecf37bb2067ac00832c28148e3edf94f5c /docs/configuration/cheatsheet.md | |
parent | 15db18af691f91ae7c834aa65f4b4d11d1c32d4c (diff) | |
parent | f3e074e949ce603446728b02ea059efe2a05a841 (diff) | |
download | pleroma-be2777715650d0ac80509f0bd22b4cea8641f9b3.tar.gz |
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
Diffstat (limited to 'docs/configuration/cheatsheet.md')
-rw-r--r-- | docs/configuration/cheatsheet.md | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index cad3af68d..30d673eba 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -70,11 +70,6 @@ You shouldn't edit the base config directly to avoid breakages and merge conflic * `account_field_value_length`: An account field value maximum length (default: `2048`). * `external_user_synchronization`: Enabling following/followers counters synchronization for external users. -!!! danger - This is a Work In Progress, not usable just yet - -* `dynamic_configuration`: Allow transferring configuration to DB with the subsequent customization from Admin api. - ## Federation ### MRF policies @@ -355,7 +350,7 @@ Available caches: * `proxy_url`: an upstream proxy to fetch posts and/or media with, (default: `nil`) * `send_user_agent`: should we include a user agent with HTTP requests? (default: `true`) -* `user_agent`: what user agent should we use? (default: `:default`), must be string or `:default` +* `user_agent`: what user agent should we use? (default: `:default`), must be string or `:default` * `adapter`: array of hackney options @@ -841,3 +836,7 @@ config :auto_linker, ## Custom Runtime Modules (`:modules`) * `runtime_dir`: A path to custom Elixir modules (such as MRF policies). + + +## :configurable_from_database +Enable/disable configuration from database. |