diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-19 21:36:36 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-19 21:36:36 +0000 |
| commit | 33729bbb2834bfa1f223b11d47dc8e3230d47657 (patch) | |
| tree | c168dab53cb5868f7c0939f99e20f031124a1d54 /config | |
| parent | c1c64d6d06fb7307245880d6605d9d9153a4784f (diff) | |
| parent | 581756ccc50cc08823957a2f24f506bf23c7cd22 (diff) | |
| download | pleroma-33729bbb2834bfa1f223b11d47dc8e3230d47657.tar.gz pleroma-33729bbb2834bfa1f223b11d47dc8e3230d47657.zip | |
Merge branch 'feature/richmedia-ttl' into 'develop'
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index bda92e45d..569411866 100644 --- a/config/config.exs +++ b/config/config.exs @@ -345,7 +345,8 @@ config :pleroma, :rich_media, Pleroma.Web.RichMedia.Parsers.TwitterCard, Pleroma.Web.RichMedia.Parsers.OGP, Pleroma.Web.RichMedia.Parsers.OEmbed - ] + ], + ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl] config :pleroma, :media_proxy, enabled: false, |