diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-09-24 13:00:48 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-09-24 13:00:48 +0300 |
| commit | 5e9759cd7d0730c14bcc44e9b3dbda94947d602f (patch) | |
| tree | 5917d89cad99d14a246e33f3e8ebd56e70abe20b /config/config.exs | |
| parent | 79c3443b609663ab23a4353ebdb7e5e2f0e6a150 (diff) | |
| parent | 29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff) | |
| download | pleroma-5e9759cd7d0730c14bcc44e9b3dbda94947d602f.tar.gz pleroma-5e9759cd7d0730c14bcc44e9b3dbda94947d602f.zip | |
Merge branch 'develop' into feature/return-link-for-password-reset
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index c7e0cf09f..403ade60d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -109,6 +109,7 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" config :pleroma, Pleroma.Uploaders.S3, bucket: nil, + streaming_enabled: true, public_endpoint: "https://s3.amazonaws.com" config :pleroma, Pleroma.Uploaders.MDII, @@ -122,7 +123,8 @@ config :pleroma, :emoji, # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` Custom: ["/emoji/*.png", "/emoji/**/*.png"] ], - default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json" + default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json", + shared_pack_cache_seconds_per_file: 60 config :pleroma, :uri_schemes, valid_schemes: [ @@ -507,7 +509,7 @@ config :auto_linker, class: false, strip_prefix: false, new_window: false, - rel: false + rel: "ugc" ] config :pleroma, :ldap, |