projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index d30b3319798aba49c7088c1ec159a09d00d12ed7..e084d1a883a69afb295689aed489afc4870d63a9 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-12,7
+12,7
@@
config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
config :pleroma, Pleroma.Captcha,
enabled: false,
config :pleroma, Pleroma.Captcha,
enabled: false,
- seconds_
retained: 18
0,
+ seconds_
valid: 6
0,
method: Pleroma.Captcha.Kocaptcha
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
method: Pleroma.Captcha.Kocaptcha
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
@@
-54,6
+54,17
@@
config :pleroma, :uri_schemes,
"xmpp"
]
"xmpp"
]
+websocket_config = [
+ path: "/websocket",
+ serializer: [
+ {Phoenix.Socket.V1.JSONSerializer, "~> 1.0.0"},
+ {Phoenix.Socket.V2.JSONSerializer, "~> 2.0.0"}
+ ],
+ timeout: 60_000,
+ transport_log: false,
+ compress: false
+]
+
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "localhost"],
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "localhost"],
@@
-62,6
+73,8
@@
config :pleroma, Pleroma.Web.Endpoint,
{:_,
[
{"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []},
{:_,
[
{"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []},
+ {"/socket/websocket", Phoenix.Endpoint.CowboyWebSocket,
+ {nil, {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
{:_, Plug.Adapters.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
]}
]
{:_, Plug.Adapters.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
]}
]
@@
-78,6
+91,12
@@
config :logger, :console,
format: "$time $metadata[$level] $message\n",
metadata: [:request_id]
format: "$time $metadata[$level] $message\n",
metadata: [:request_id]
+config :logger, :ex_syslogger,
+ level: :debug,
+ ident: "Pleroma",
+ format: "$date $time $metadata[$level] $message",
+ metadata: [:request_id]
+
config :mime, :types, %{
"application/xml" => ["xml"],
"application/xrd+xml" => ["xrd+xml"],
config :mime, :types, %{
"application/xml" => ["xml"],
"application/xrd+xml" => ["xrd+xml"],
@@
-173,13
+192,7
@@
config :pleroma, :mrf_simple,
reject: [],
accept: []
reject: [],
accept: []
-config :pleroma, :media_proxy,
- enabled: false,
- # base_url: "https://cache.pleroma.social",
- proxy_opts: [
- # inline_content_types: [] | false | true,
- # http: [:insecure]
- ]
+config :pleroma, :media_proxy, enabled: false
config :pleroma, :chat, enabled: true
config :pleroma, :chat, enabled: true
@@
-249,7
+262,8
@@
config :pleroma, Pleroma.User,
"auth",
"proxy",
"dev",
"auth",
"proxy",
"dev",
- "internal"
+ "internal",
+ "media"
]
config :pleroma, Pleroma.Web.Federator, max_jobs: 50
]
config :pleroma, Pleroma.Web.Federator, max_jobs: 50