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 /priv/templates | |
| parent | e761d76e4fe95a8fadd8eb05d5c55ef5fc4bc8ec (diff) | |
| parent | be2777715650d0ac80509f0bd22b4cea8641f9b3 (diff) | |
| download | pleroma-cf19bf3c7c82eb64f10cee309484d9591b1a3cae.tar.gz pleroma-cf19bf3c7c82eb64f10cee309484d9591b1a3cae.zip | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'priv/templates')
| -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? %> |