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 /priv | |
| parent | 15db18af691f91ae7c834aa65f4b4d11d1c32d4c (diff) | |
| parent | f3e074e949ce603446728b02ea059efe2a05a841 (diff) | |
| download | pleroma-be2777715650d0ac80509f0bd22b4cea8641f9b3.tar.gz pleroma-be2777715650d0ac80509f0bd22b4cea8641f9b3.zip | |
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/templates/sample_config.eex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index dc75d4008..bc7e37375 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -20,8 +20,7 @@ config :pleroma, :instance, email: "<%= email %>", notify_email: "<%= notify_email %>", limit: 5000, - registrations_open: true, - dynamic_configuration: <%= db_configurable? %> + registrations_open: true config :pleroma, :media_proxy, enabled: false, @@ -70,3 +69,5 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>" # host: "s3.wasabisys.com" config :joken, default_signer: "<%= jwt_secret %>" + +config :pleroma, configurable_from_database: <%= db_configurable? %> |