projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into global-status-expiration
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 7c94a0f26bfaad6115fe58d92778604462982997..8670a57b9ed44ce96d3c71b234d46459d2faa354 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-170,7
+170,7
@@
config :mime, :types, %{
"application/ld+json" => ["activity+json"]
}
"application/ld+json" => ["activity+json"]
}
-config :tesla, adapter: Tesla.Adapter.
Hackney
+config :tesla, adapter: Tesla.Adapter.
Gun
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
proxy_url: nil,
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
proxy_url: nil,
@@
-343,6
+343,8
@@
config :pleroma, :mrf_keyword,
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :mrf_subchain, match_actor: %{}
+config :pleroma, :mrf_activity_expiration, days: 365
+
config :pleroma, :mrf_vocabulary,
accept: [],
reject: []
config :pleroma, :mrf_vocabulary,
accept: [],
reject: []
@@
-482,10
+484,6
@@
config :pleroma, :workers,
federator_outgoing: 5
]
federator_outgoing: 5
]
-config :pleroma, :fetch_initial_posts,
- enabled: false,
- pages: 5
-
config :auto_linker,
opts: [
extra: true,
config :auto_linker,
opts: [
extra: true,
@@
-607,10
+605,10
@@
config :pleroma, Pleroma.Repo,
prepare: :unnamed
config :pleroma, :connections_pool,
prepare: :unnamed
config :pleroma, :connections_pool,
-
receive_connectio
n_timeout: 250,
+
checki
n_timeout: 250,
max_connections: 250,
max_connections: 250,
- retry:
0
,
- retry_timeout: 100,
+ retry:
1
,
+ retry_timeout: 100
0
,
await_up_timeout: 5_000
config :pleroma, :pools,
await_up_timeout: 5_000
config :pleroma, :pools,
@@
-649,6
+647,11
@@
config :pleroma, :hackney_pools,
timeout: 300_000
]
timeout: 300_000
]
+config :pleroma, :restrict_unauthenticated,
+ timelines: %{local: false, federated: false},
+ profiles: %{local: false, remote: false},
+ activities: %{local: false, remote: false}
+
# 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"