diff options
author | lain <lain@soykaf.club> | 2025-03-01 16:41:38 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2025-03-01 16:41:38 +0000 |
commit | af6d5470d29f294e9b356da36cccbcaf85379f78 (patch) | |
tree | 81eb0ba210f674eb0f6f41cde9b692a27ea96ca0 /config/config.exs | |
parent | fe3e61f6ece0335627f675e04a93917e6c613c6c (diff) | |
parent | cd5f018206c991628ff1530095bb71cf941e7a8b (diff) | |
download | pleroma-af6d5470d29f294e9b356da36cccbcaf85379f78.tar.gz pleroma-af6d5470d29f294e9b356da36cccbcaf85379f78.zip |
Merge branch 'release/2.9.0' into 'stable'
Release/2.9.0
See merge request pleroma/pleroma!4331
Diffstat (limited to 'config/config.exs')
-rw-r--r-- | config/config.exs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index 07e98011d..31783b488 100644 --- a/config/config.exs +++ b/config/config.exs @@ -150,7 +150,10 @@ config :mime, :types, %{ "application/xrd+xml" => ["xrd+xml"], "application/jrd+json" => ["jrd+json"], "application/activity+json" => ["activity+json"], - "application/ld+json" => ["activity+json"] + "application/ld+json" => ["activity+json"], + # Can be removed when bumping MIME past 2.0.5 + # see https://akkoma.dev/AkkomaGang/akkoma/issues/657 + "image/apng" => ["apng"] } config :tesla, adapter: Tesla.Adapter.Hackney @@ -359,7 +362,8 @@ config :pleroma, :activitypub, follow_handshake_timeout: 500, note_replies_output_limit: 5, sign_object_fetches: true, - authorized_fetch_mode: false + authorized_fetch_mode: false, + client_api_enabled: false config :pleroma, :streamer, workers: 3, @@ -413,11 +417,6 @@ config :pleroma, :mrf_vocabulary, accept: [], reject: [] -config :pleroma, :mrf_dnsrbl, - nameserver: "127.0.0.1", - port: 53, - zone: "bl.pleroma.com" - # threshold of 7 days config :pleroma, :mrf_object_age, threshold: 604_800, |