diff options
| author | Mark Felder <feld@feld.me> | 2021-01-25 09:45:06 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-25 09:45:06 -0600 |
| commit | 537ba1c5e07a33692ed63ca50b50e240efce6f88 (patch) | |
| tree | 2a364998d729d1f65d5b87b5703604ac8d163678 /config/config.exs | |
| parent | 28581e03ad5761aa484a7fa427be8ab5695f0892 (diff) | |
| parent | 0a6f5f479348eff5f5404d4455fcb8254809812f (diff) | |
| download | pleroma-537ba1c5e07a33692ed63ca50b50e240efce6f88.tar.gz pleroma-537ba1c5e07a33692ed63ca50b50e240efce6f88.zip | |
Merge branch 'develop' into refactor/deactivated_user_field
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index db45f7a3d..c4a690799 100644 --- a/config/config.exs +++ b/config/config.exs @@ -64,14 +64,23 @@ config :pleroma, Pleroma.Upload, link_name: false, proxy_remote: false, filename_display_max_length: 30, - default_description: nil + default_description: nil, + base_url: nil config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" config :pleroma, Pleroma.Uploaders.S3, bucket: nil, - streaming_enabled: true, - public_endpoint: "https://s3.amazonaws.com" + bucket_namespace: nil, + truncated_namespace: nil, + streaming_enabled: true + +config :ex_aws, :s3, + # host: "s3.wasabisys.com", # required if not Amazon AWS + access_key_id: nil, + secret_access_key: nil, + # region: "us-east-1", # may be required for Amazon AWS + scheme: "https://" config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], @@ -823,6 +832,11 @@ config :pleroma, Pleroma.User.Backup, limit_days: 7, dir: nil +config :pleroma, ConcurrentLimiter, [ + {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]}, + {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]} +] + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |