diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-26 11:23:05 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-26 11:23:05 -0600 |
| commit | d770cffce0aec0eeb427c8851437f04329700da9 (patch) | |
| tree | 8a6f4db2849e613e0be968d3c0edc605b7040563 /priv/templates | |
| parent | 108a39c8766402dcbd0235d8746e2100a18e5813 (diff) | |
| parent | d9e2bd8f40b7d77713a72ef94da2fbe8ffa75b91 (diff) | |
| download | pleroma-d770cffce0aec0eeb427c8851437f04329700da9.tar.gz pleroma-d770cffce0aec0eeb427c8851437f04329700da9.zip | |
Merge branch 'develop' into issue/1280
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? %> |