projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix migration.
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 01109b30f326455407dad32f6c2b23b1f50dac2d..a7429fcdfcd4ba4d6a0898b5aef4bd166e1924cc 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-9,6
+9,9
@@
use Mix.Config
config :pleroma,
ecto_repos: [Pleroma.Repo]
config :pleroma,
ecto_repos: [Pleroma.Repo]
+config :pleroma, Pleroma.Repo,
+ types: Pleroma.PostgresTypes
+
config :pleroma, Pleroma.Upload,
uploads: "uploads"
config :pleroma, Pleroma.Upload,
uploads: "uploads"
@@
-27,7
+30,8
@@
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, :websub, Pleroma.Web.Websub
@@
-49,7
+53,8
@@
config :pleroma, :instance,
name: "Pleroma",
email: "example@example.com",
limit: 5000,
name: "Pleroma",
email: "example@example.com",
limit: 5000,
- registrations_open: true
+ registrations_open: true,
+ federating: true
config :pleroma, :media_proxy,
enabled: false,
config :pleroma, :media_proxy,
enabled: false,
@@
-59,6
+64,11
@@
config :pleroma, :media_proxy,
config :pleroma, :chat,
enabled: true
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.
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"