Merge branch 'fix/config-disable-chat' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 8f6fe00fbf64382b3bb898044153b88f0e280810..01109b30f326455407dad32f6c2b23b1f50dac2d 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -32,7 +32,32 @@ config :mime, :types, %{
 
 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)}"
+          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
+
+config :pleroma, :media_proxy,
+  enabled: false,
+  redirect_on_failure: true
+  #base_url: "https://cache.pleroma.social"
+
+config :pleroma, :chat,
+  enabled: true
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.