projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix specs.
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 503ce8d64be86757ab9dd586f14a720bb22dbb84..e6c695215e50b06054d089034e5ed7381c9e90cb 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-27,12
+27,13
@@
config :logger, :console,
metadata: [:request_id]
config :mime, :types, %{
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, :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)}"
version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
"Pleroma #{String.trim(version)}"
@@
-40,6
+41,10
@@
version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
_ -> "Pleroma dev"
end
_ -> "Pleroma dev"
end
+# Configures http settings, upstream proxy etc.
+config :pleroma, :http,
+ proxy_url: nil
+
config :pleroma, :instance,
version: version,
name: "Pleroma",
config :pleroma, :instance,
version: version,
name: "Pleroma",
@@
-52,6
+57,9
@@
config :pleroma, :media_proxy,
redirect_on_failure: true
#base_url: "https://cache.pleroma.social"
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.
import_config "#{Mix.env}.exs"
# 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"