Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature...

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 503ce8d64be86757ab9dd586f14a720bb22dbb84..b0f4578d5e537b27c62c3ce1a0f83c7a0d27fc8f 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -6,11 +6,11 @@
 use Mix.Config
 
 # General application configuration
-config :pleroma,
-  ecto_repos: [Pleroma.Repo]
+config :pleroma, ecto_repos: [Pleroma.Repo]
 
-config :pleroma, Pleroma.Upload,
-  uploads: "uploads"
+config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
+
+config :pleroma, Pleroma.Upload, uploads: "uploads"
 
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
@@ -18,8 +18,7 @@ config :pleroma, Pleroma.Web.Endpoint,
   protocol: "https",
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
   render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
-  pubsub: [name: Pleroma.PubSub,
-           adapter: Phoenix.PubSub.PG2]
+  pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]
 
 # Configures Elixir's Logger
 config :logger, :console,
@@ -27,31 +26,58 @@ config :logger, :console,
   metadata: [:request_id]
 
 config :mime, :types, %{
-  "application/xrd+xml" => ["xrd+xml"]
+  "application/xrd+xml" => ["xrd+xml"],
+  "application/activity+json" => ["activity+json"],
+  "application/ld+json" => ["activity+json"]
 }
 
 config :pleroma, :websub, Pleroma.Web.Websub
 config :pleroma, :ostatus, Pleroma.Web.OStatus
-config :pleroma, :httpoison, HTTPoison
+config :pleroma, :httpoison, Pleroma.HTTP
+
+version =
+  with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
+    "Pleroma #{Mix.Project.config()[:version]} #{String.trim(version)}"
+  else
+    _ -> "Pleroma #{Mix.Project.config()[:version]} dev"
+  end
 
-version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
-            "Pleroma #{String.trim(version)}"
-          else
-            _ -> "Pleroma dev"
-          end
+# Configures http settings, upstream proxy etc.
+config :pleroma, :http, proxy_url: nil
 
 config :pleroma, :instance,
   version: version,
   name: "Pleroma",
   email: "example@example.com",
   limit: 5000,
-  registrations_open: true
+  upload_limit: 16_000_000,
+  registrations_open: true,
+  federating: true,
+  rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy
+
+config :pleroma, :mrf_simple,
+  media_removal: [],
+  media_nsfw: [],
+  federated_timeline_removal: [],
+  reject: []
 
 config :pleroma, :media_proxy,
   enabled: false,
   redirect_on_failure: true
-  #base_url: "https://cache.pleroma.social"
+
+# base_url: "https://cache.pleroma.social"
+
+config :pleroma, :chat, enabled: true
+
+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"
+import_config "#{Mix.env()}.exs"