Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 18a2490a468d2b06fcbf2ed17fe541ca2831d58d..05995085c46d3fcbc4f691d9ac2d484a772a59a5 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -30,6 +30,32 @@ config :mime, :types, %{
   "application/xrd+xml" => ["xrd+xml"]
 }
 
+config :pleroma, :websub, Pleroma.Web.Websub
+config :pleroma, :ostatus, Pleroma.Web.OStatus
+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: ""
+
+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"
+
 # 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"