diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-22 20:20:39 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-22 20:20:39 +0300 |
| commit | cf19bf3c7c82eb64f10cee309484d9591b1a3cae (patch) | |
| tree | 77cd904cd7d397eb2ac72561a8cd5dcdd0609044 /docs/configuration | |
| parent | e761d76e4fe95a8fadd8eb05d5c55ef5fc4bc8ec (diff) | |
| parent | be2777715650d0ac80509f0bd22b4cea8641f9b3 (diff) | |
| download | pleroma-cf19bf3c7c82eb64f10cee309484d9591b1a3cae.tar.gz pleroma-cf19bf3c7c82eb64f10cee309484d9591b1a3cae.zip | |
Merge branch 'develop' into issue/1383
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 48d980aea..021bb54c9 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 @@ -850,3 +845,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. |