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 'feature/local-only-scope'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 0c73ecb59f0df9189d957dcb341290a692f44e9b..bd611fd426c45c1325e29ac48d030e7fa43014bd 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-123,7
+123,6
@@
websocket_config = [
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
- instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
url: [host: "localhost"],
http: [
ip: {127, 0, 0, 1},
url: [host: "localhost"],
http: [
ip: {127, 0, 0, 1},
@@
-636,7
+635,12
@@
config :pleroma, Pleroma.Emails.UserEmail,
config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false
config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false
-config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics"
+config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
+ enabled: false,
+ auth: false,
+ ip_whitelist: [],
+ path: "/api/pleroma/app_metrics",
+ format: :text
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 25,
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 25,
@@
-677,7
+681,18
@@
config :pleroma, :rate_limit,
config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
-config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true
+config :pleroma, Pleroma.Web.Plugs.RemoteIp,
+ enabled: true,
+ headers: ["x-forwarded-for"],
+ proxies: [],
+ reserved: [
+ "127.0.0.0/8",
+ "::1/128",
+ "fc00::/7",
+ "10.0.0.0/8",
+ "172.16.0.0/12",
+ "192.168.0.0/16"
+ ]
config :pleroma, :static_fe, enabled: false
config :pleroma, :static_fe, enabled: false
@@
-791,6
+806,8
@@
config :pleroma, :hackney_pools,
timeout: 300_000
]
timeout: 300_000
]
+config :pleroma, :majic_pool, size: 2
+
private_instance? = :if_instance_is_private
config :pleroma, :restrict_unauthenticated,
private_instance? = :if_instance_is_private
config :pleroma, :restrict_unauthenticated,