Merge branch 'mastodon-emoji-endpoint' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 8eea4dd0a1d605aedba6a1dfc68dacd9172d5e07..c4f89c40c5433399e1fd971a6d379666e60a342c 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -9,9 +9,13 @@ use Mix.Config
 config :pleroma,
   ecto_repos: [Pleroma.Repo]
 
+config :pleroma, Pleroma.Upload,
+  uploads: "uploads"
+
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
   url: [host: "localhost"],
+  protocol: "https",
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
   render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
   pubsub: [name: Pleroma.PubSub,
@@ -22,6 +26,27 @@ config :logger, :console,
   format: "$time $metadata[$level] $message\n",
   metadata: [:request_id]
 
+config :mime, :types, %{
+  "application/xrd+xml" => ["xrd+xml"]
+}
+
+config :pleroma, :websub, Pleroma.Web.Websub
+config :pleroma, :ostatus, Pleroma.Web.OStatus
+config :pleroma, :httpoison, HTTPoison
+
+version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
+            "Pleroma #{String.trim(version)}"
+          else
+            _ -> "Pleroma dev"
+          end
+
+config :pleroma, :instance,
+  version: version,
+  name: "Pleroma",
+  email: "example@example.com",
+  limit: 5000,
+  registrations_open: true
+
 # 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"