projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for dynamic configuration
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 09c3be7de3e42130faa61dbdba381dd6ce5f5aea..3962ac019cd862ce36b5d03ea6f82fdbf28f91e3 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-243,9
+243,10
@@
config :pleroma, :instance,
max_report_comment_size: 1000,
safe_dm_mentions: false,
healthcheck: false,
max_report_comment_size: 1000,
safe_dm_mentions: false,
healthcheck: false,
- remote_post_retention_days: 90
-
-config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
+ remote_post_retention_days: 90,
+ skip_thread_containment: true,
+ limit_to_local_content: :unauthenticated,
+ dynamic_configuration: false
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
@@
-326,6
+327,8
@@
config :pleroma, :mrf_keyword,
federated_timeline_removal: [],
replace: []
federated_timeline_removal: [],
replace: []
+config :pleroma, :mrf_subchain, match_actor: %{}
+
config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy,
config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy,
@@
-358,8
+361,8
@@
config :pleroma, :suggestions,
third_party_engine:
"http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
timeout: 300_000,
third_party_engine:
"http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
timeout: 300_000,
- limit:
23
,
- web: "https://vinayaka.distsn.org
/?{{host}}+{{user}}
"
+ limit:
40
,
+ web: "https://vinayaka.distsn.org"
config :pleroma, :http_security,
enabled: true,
config :pleroma, :http_security,
enabled: true,
@@
-439,6
+442,8
@@
config :auto_linker,
opts: [
scheme: true,
extra: true,
opts: [
scheme: true,
extra: true,
+ # TODO: Set to :no_scheme when it works properly
+ validate_tld: true,
class: false,
strip_prefix: false,
new_window: false,
class: false,
strip_prefix: false,
new_window: false,
@@
-459,7
+464,11
@@
config :pleroma, :ldap,
config :esshd,
enabled: false
config :esshd,
enabled: false
-oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "")
+oauth_consumer_strategies =
+ System.get_env("OAUTH_CONSUMER_STRATEGIES")
+ |> to_string()
+ |> String.split()
+ |> Enum.map(&hd(String.split(&1, ":")))
ueberauth_providers =
for strategy <- oauth_consumer_strategies do
ueberauth_providers =
for strategy <- oauth_consumer_strategies do
@@
-492,9
+501,15
@@
config :pleroma, :oauth2,
config :pleroma, :database, rum_enabled: false
config :pleroma, :database, rum_enabled: false
+config :pleroma, :env, Mix.env()
+
config :http_signatures,
adapter: Pleroma.Signature
config :http_signatures,
adapter: Pleroma.Signature
+config :pleroma, :rate_limit,
+ search: [{1000, 10}, {1000, 30}],
+ app_account_creation: {1_800_000, 25}
+
# 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"