X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=fd9662aeacac4a68fa9670315adef9ff6c6051b0;hb=cb21bf5fc225899ad6cf87f5ab0253506cf0531e;hp=b0f4578d5e537b27c62c3ce1a0f83c7a0d27fc8f;hpb=d24ddd9fb9fb5254b2e80cbe70ba9bc83f2cd0da;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index b0f4578d5..fd9662aea 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -10,7 +10,9 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
 
 config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
 
-config :pleroma, Pleroma.Upload, uploads: "uploads"
+config :pleroma, Pleroma.Upload, 
+  uploads: "uploads",
+  strip_exif: false
 
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
@@ -26,6 +28,7 @@ config :logger, :console,
   metadata: [:request_id]
 
 config :mime, :types, %{
+  "application/xml" => ["xml"],
   "application/xrd+xml" => ["xrd+xml"],
   "application/activity+json" => ["activity+json"],
   "application/ld+json" => ["activity+json"]
@@ -53,13 +56,27 @@ config :pleroma, :instance,
   upload_limit: 16_000_000,
   registrations_open: true,
   federating: true,
-  rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy
+  rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
+  public: true,
+  quarantined_instances: []
+
+config :pleroma, :activitypub,
+  accept_blocks: true,
+  unfollow_blocked: true,
+  outgoing_blocks: true
+
+config :pleroma, :user, deny_follow_blocked: true
+
+config :pleroma, :mrf_rejectnonpublic,
+  allow_followersonly: false,
+  allow_direct: false
 
 config :pleroma, :mrf_simple,
   media_removal: [],
   media_nsfw: [],
   federated_timeline_removal: [],
-  reject: []
+  reject: [],
+  accept: []
 
 config :pleroma, :media_proxy,
   enabled: false,