diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-23 11:42:10 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-23 11:42:10 +0300 |
| commit | 2cfe1b93854c117fda19e54ea17c99f72413a569 (patch) | |
| tree | 1ae8ca344d7f970db4f6f6cb9283d3cf21d1756a /docs/configuration | |
| parent | 5ea859644897354dfea47655ce39dda46439040a (diff) | |
| parent | dddebee047efc4ab1dff6565bef32954695846a7 (diff) | |
| download | pleroma-2cfe1b93854c117fda19e54ea17c99f72413a569.tar.gz | |
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'docs/configuration')
| -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. |