diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-18 11:56:27 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-18 11:56:27 +0300 |
| commit | 01bd6a1e54c8734e8965f153a9406cecc07950f3 (patch) | |
| tree | 791348626f54b390167693da8c1a6481c54d78de /docs/configuration/cheatsheet.md | |
| parent | 8a383707ae143ba47fa1ba68da20bc6bec425126 (diff) | |
| parent | 1199cf3a788334cd3fdb968d9f736e43c1401da1 (diff) | |
| download | pleroma-01bd6a1e54c8734e8965f153a9406cecc07950f3.tar.gz pleroma-01bd6a1e54c8734e8965f153a9406cecc07950f3.zip | |
Merge branch 'develop' into feature/admin-api-status-count-per-instance
Diffstat (limited to 'docs/configuration/cheatsheet.md')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 707d7fdbd..1078c4e87 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -911,6 +911,21 @@ config :auto_linker, Boolean, enables/disables in-database configuration. Read [Transfering the config to/from the database](../administration/CLI_tasks/config.md) for more information. +## :database_config_whitelist + +List of valid configuration sections which are allowed to be configured from the +database. Settings stored in the database before the whitelist is configured are +still applied, so it is suggested to only use the whitelist on instances that +have not migrated the config to the database. + +Example: +```elixir +config :pleroma, :database_config_whitelist, [ + {:pleroma, :instance}, + {:pleroma, Pleroma.Web.Metadata}, + {:auto_linker} +] +``` ### Multi-factor authentication - :two_factor_authentication * `totp` - a list containing TOTP configuration |