X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=a7429fcdfcd4ba4d6a0898b5aef4bd166e1924cc;hb=0abd8a6bad9d769e95f4c636cd837f83e407f8e8;hp=6696a49023a97f6276fe84db0afb7bc7eb3271cf;hpb=50409326a853db7bd9f538f0ddbec805c134920f;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 6696a4902..a7429fcdf 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -9,6 +9,9 @@ use Mix.Config
 config :pleroma,
   ecto_repos: [Pleroma.Repo]
 
+config :pleroma, Pleroma.Repo,
+  types: Pleroma.PostgresTypes
+
 config :pleroma, Pleroma.Upload,
   uploads: "uploads"
 
@@ -27,12 +30,13 @@ config :logger, :console,
   metadata: [:request_id]
 
 config :mime, :types, %{
-  "application/xrd+xml" => ["xrd+xml"]
+  "application/xrd+xml" => ["xrd+xml"],
+  "application/activity+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 #{String.trim(version)}"
@@ -40,11 +44,30 @@ version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
             _ -> "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
+  limit: 5000,
+  registrations_open: true,
+  federating: true
+
+config :pleroma, :media_proxy,
+  enabled: false,
+  redirect_on_failure: true
+  #base_url: "https://cache.pleroma.social"
+
+config :pleroma, :chat,
+  enabled: true
+
+config :ecto, json_library: Jason
+
+config :phoenix, :format_encoders,
+  json: Jason
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.