diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-22 15:59:24 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-22 15:59:24 -0600 |
| commit | e151dea2768d82a07316887e903f7d1bfc2d0963 (patch) | |
| tree | 06c76d5071cedca63aeb6c1a044f574376129ddc /priv | |
| parent | 7c0ac54437e07b85d857700296173035fec5e202 (diff) | |
| parent | be2777715650d0ac80509f0bd22b4cea8641f9b3 (diff) | |
| download | pleroma-e151dea2768d82a07316887e903f7d1bfc2d0963.tar.gz pleroma-e151dea2768d82a07316887e903f7d1bfc2d0963.zip | |
Merge branch 'develop' into feature/new-registrations-digest
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? %> |