diff options
| author | feld <feld@feld.me> | 2020-10-12 17:24:24 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-12 17:24:24 +0000 |
| commit | 03855f97893d94777f3dfe71b5e792010429e0c8 (patch) | |
| tree | 39426a8ed2c0dd752f36ecc4a0b5e227246b9657 /priv | |
| parent | 68d0380633a14422003a507705143932358b372e (diff) | |
| parent | 6c61ef14c3f48910c52e17c68fce175682717962 (diff) | |
| download | pleroma-03855f97893d94777f3dfe71b5e792010429e0c8.tar.gz | |
Merge branch 'improve/instance-gen' into 'develop'
#2159 Support enabling upload filters during instance gen
See merge request pleroma/pleroma!3070
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/templates/sample_config.eex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index bc7e37375..cdddc47ea 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -71,3 +71,7 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>" config :joken, default_signer: "<%= jwt_secret %>" config :pleroma, configurable_from_database: <%= db_configurable? %> + +<%= if Kernel.length(upload_filters) > 0 do +"config :pleroma, Pleroma.Upload, filters: #{inspect(upload_filters)}" +end %> |