diff options
| author | Lain Soykaf <lain@lain.com> | 2025-03-01 14:07:02 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2025-03-01 14:07:02 +0400 |
| commit | 4604f2944e8997b79c683fab95217d551fa83585 (patch) | |
| tree | ebf4c67f0ab82439350848ea697ded6fcbea199e /config | |
| parent | ca3c2a4ffaf87139a044b8b5ba2f84ead8f97891 (diff) | |
| parent | 76cfc6127fa05a8c5214d1dff368bad0e0a0b1a8 (diff) | |
| download | pleroma-4604f2944e8997b79c683fab95217d551fa83585.tar.gz pleroma-4604f2944e8997b79c683fab95217d551fa83585.zip | |
Merge branch 'pleroma-ensure-authorized-fetch' into security-2.9
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/description.exs | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 07e98011d..a9f6aa0b7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -359,7 +359,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: true 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" } ] }, |