diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-18 13:27:50 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-18 13:27:50 +0000 |
| commit | f9a0014681a2054ca9fec9df4729bce8bc0b4060 (patch) | |
| tree | edbcc663ace93b90eed6d9b457077b785980a36c /config | |
| parent | 1485d75f3c51d8297e23bc64652c7303a7a7e9fb (diff) | |
| parent | 7bb50bfcccdc08f72113fda5732b87876eb01df8 (diff) | |
| download | pleroma-f9a0014681a2054ca9fec9df4729bce8bc0b4060.tar.gz pleroma-f9a0014681a2054ca9fec9df4729bce8bc0b4060.zip | |
Merge branch 'feature/signed-object-fetches' into 'develop'
signed object fetches
See merge request pleroma/pleroma!1446
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 38780eef7..bda92e45d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -305,7 +305,8 @@ config :pleroma, :activitypub, accept_blocks: true, unfollow_blocked: true, outgoing_blocks: true, - follow_handshake_timeout: 500 + follow_handshake_timeout: 500, + sign_object_fetches: true config :pleroma, :user, deny_follow_blocked: true diff --git a/config/test.exs b/config/test.exs index 0af62aa14..92dca18bc 100644 --- a/config/test.exs +++ b/config/test.exs @@ -31,6 +31,8 @@ config :pleroma, :instance, skip_thread_containment: false, federating: false +config :pleroma, :activitypub, sign_object_fetches: false + # Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, |