diff options
| author | lain <lain@soykaf.club> | 2025-03-01 17:47:12 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2025-03-01 17:47:12 +0000 |
| commit | 16944eb9dae2b8c41793b5f015ee54818bd939f7 (patch) | |
| tree | 81eb0ba210f674eb0f6f41cde9b692a27ea96ca0 /config | |
| parent | a8e863e0d627b6ed9563d953ee2cc8c9f4c9ee7a (diff) | |
| parent | af6d5470d29f294e9b356da36cccbcaf85379f78 (diff) | |
| download | pleroma-16944eb9dae2b8c41793b5f015ee54818bd939f7.tar.gz pleroma-16944eb9dae2b8c41793b5f015ee54818bd939f7.zip | |
Merge branch 'stable' into 'develop'
2.9.0 mergeback
See merge request pleroma/pleroma!4332
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 | ||||
| -rw-r--r-- | config/description.exs | 5 | ||||
| -rw-r--r-- | config/test.exs | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 27e2d4711..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, diff --git a/config/description.exs b/config/description.exs index e8d154124..f091e4924 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1772,6 +1772,11 @@ config :pleroma, :config_description, [ type: :integer, description: "Following handshake timeout", suggestions: [500] + }, + %{ + key: :client_api_enabled, + type: :boolean, + description: "Allow client to server ActivityPub interactions" } ] }, diff --git a/config/test.exs b/config/test.exs index 6fe84478a..1903ac9ee 100644 --- a/config/test.exs +++ b/config/test.exs @@ -38,7 +38,10 @@ config :pleroma, :instance, external_user_synchronization: false, static_dir: "test/instance_static/" -config :pleroma, :activitypub, sign_object_fetches: false, follow_handshake_timeout: 0 +config :pleroma, :activitypub, + sign_object_fetches: false, + follow_handshake_timeout: 0, + client_api_enabled: true # Configure your database config :pleroma, Pleroma.Repo, |