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

diff --git a/config/config.exs b/config/config.exs
index fc8067b49..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,8 +28,10 @@ config :logger, :console,
   metadata: [:request_id]
 
 config :mime, :types, %{
+  "application/xml" => ["xml"],
   "application/xrd+xml" => ["xrd+xml"],
-  "application/activity+json" => ["activity+json"]
+  "application/activity+json" => ["activity+json"],
+  "application/ld+json" => ["activity+json"]
 }
 
 config :pleroma, :websub, Pleroma.Web.Websub
@@ -49,8 +53,30 @@ config :pleroma, :instance,
   name: "Pleroma",
   email: "example@example.com",
   limit: 5000,
+  upload_limit: 16_000_000,
   registrations_open: true,
-  federating: true
+  federating: true,
+  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: [],
+  accept: []
 
 config :pleroma, :media_proxy,
   enabled: false,
@@ -64,6 +90,11 @@ config :ecto, json_library: Jason
 
 config :phoenix, :format_encoders, json: Jason
 
+config :pleroma, :gopher,
+  enabled: false,
+  ip: {0, 0, 0, 0},
+  port: 9999
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"