moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: allow relaying to be disabled

This commit is contained in:
William Pitcock 2018-08-06 06:18:15 +00:00
parent b7ca7f282a
commit 7bed350a23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.exs
View File

@ -59,6 +59,7 @@
upload_limit: 16_000_000, upload_limit: 16_000_000,
registrations_open: true, registrations_open: true,
federating: true, federating: true,
allow_relay: true,
rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
public: true, public: true,
quarantined_instances: [] quarantined_instances: []

11
lib/pleroma/web/router.ex
View File

@ -5,6 +5,7 @@ defmodule Pleroma.Web.Router do
@instance Application.get_env(:pleroma, :instance) @instance Application.get_env(:pleroma, :instance)
@federating Keyword.get(@instance, :federating) @federating Keyword.get(@instance, :federating)
@allow_relay Keyword.get(@instance, :allow_relay)
@public Keyword.get(@instance, :public) @public Keyword.get(@instance, :public)
@registrations_open Keyword.get(@instance, :registrations_open) @registrations_open Keyword.get(@instance, :registrations_open)
@ -318,10 +319,12 @@ def user_fetcher(username) do
end end
if @federating do if @federating do
scope "/", Pleroma.Web.ActivityPub do if @allow_relay do
# XXX: not really ostatus either scope "/", Pleroma.Web.ActivityPub do
pipe_through(:ostatus) # XXX: not really ostatus either
get("/", ActivityPubController, :relay) pipe_through(:ostatus)
get("/", ActivityPubController, :relay)
end
end end
scope "/", Pleroma.Web.ActivityPub do scope "/", Pleroma.Web.ActivityPub do