diff options
| author | feld <feld@feld.me> | 2024-05-08 03:12:09 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-05-08 03:12:09 +0000 |
| commit | 8eea4f58c7ae1618aec9f0c6a62e16771c34b787 (patch) | |
| tree | 1d7b56fd48c9f8218ddabb86d6c03696be5eb882 /config | |
| parent | b42963a52c32fb9b6cafc0863f962a8dfb952050 (diff) | |
| parent | 54c2bab25f965e2e3fa8d118bf5135c335eca2c0 (diff) | |
| download | pleroma-8eea4f58c7ae1618aec9f0c6a62e16771c34b787.tar.gz pleroma-8eea4f58c7ae1618aec9f0c6a62e16771c34b787.zip | |
Merge branch 'rich-media-db' into 'develop'
RichMedia refactor
See merge request pleroma/pleroma!4057
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 9 | ||||
| -rw-r--r-- | config/test.exs | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 32c8509be..b69044a2b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -428,7 +428,11 @@ config :pleroma, :rich_media, Pleroma.Web.RichMedia.Parsers.OEmbed ], failure_backoff: 60_000, - ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl] + ttl_setters: [ + Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl, + Pleroma.Web.RichMedia.Parser.TTL.Opengraph + ], + max_body: 5_000_000 config :pleroma, :media_proxy, enabled: false, @@ -575,7 +579,8 @@ config :pleroma, Oban, attachments_cleanup: 1, new_users_digest: 1, mute_expire: 5, - search_indexing: 10 + search_indexing: 10, + rich_media_expiration: 2 ], plugins: [Oban.Plugins.Pruner], crontab: [ diff --git a/config/test.exs b/config/test.exs index 80b01932c..9b4113dd5 100644 --- a/config/test.exs +++ b/config/test.exs @@ -61,7 +61,8 @@ config :tesla, adapter: Tesla.Mock config :pleroma, :rich_media, enabled: false, ignore_hosts: [], - ignore_tld: ["local", "localdomain", "lan"] + ignore_tld: ["local", "localdomain", "lan"], + max_body: 2_000_000 config :pleroma, :instance, multi_factor_authentication: [ @@ -174,6 +175,8 @@ config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000 config :pleroma, Pleroma.Emoji.Loader, test_emoji: true +config :pleroma, Pleroma.Web.RichMedia.Backfill, provider: Pleroma.Web.RichMedia.Backfill + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |