summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-06-16 10:39:36 +0000
committerlambda <pleromagit@rogerbraun.net>2018-06-16 10:39:36 +0000
commit1ea4a18ad859600841860cdd1a981da868aa18a0 (patch)
treec498b0fb3c5297d0a6e6e9627ef233c11fc227eb /config
parenta938d07df1679efd78e1b7c10e149270489761f7 (diff)
parent2586426fa0ee4732cb9d142a55bfd4f20f271fa9 (diff)
downloadpleroma-1ea4a18ad859600841860cdd1a981da868aa18a0.tar.gz
pleroma-1ea4a18ad859600841860cdd1a981da868aa18a0.zip
Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
Configs for mrf_rejectnonpublic See merge request pleroma/pleroma!205
Diffstat (limited to 'config')
-rw-r--r--config/config.exs4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 3292bf29c..5e57af87b 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -59,6 +59,10 @@ config :pleroma, :instance,
config :pleroma, :activitypub, accept_blocks: true
+config :pleroma, :mrf_rejectnonpublic,
+ allow_followersonly: false,
+ allow_direct: false
+
config :pleroma, :mrf_simple,
media_removal: [],
media_nsfw: [],