diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-01-30 22:16:55 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-01-30 22:16:55 +0300 |
| commit | 5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3 (patch) | |
| tree | 6677ba80418ffd34a78cba75498f2c1ab48ba14c /priv/templates | |
| parent | 45180d4c6058f790475d8ff28018c912db105082 (diff) | |
| parent | 946de2299cccebac6718e3a132397ff5c06c67ee (diff) | |
| download | pleroma-5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3.tar.gz pleroma-5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3.zip | |
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
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? %> |