projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'begone-the-dot-hack' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index d20d4fda91d13365fb72f7aacf30028aeb151497..3962ac019cd862ce36b5d03ea6f82fdbf28f91e3 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-244,10
+244,9
@@
config :pleroma, :instance,
safe_dm_mentions: false,
healthcheck: false,
remote_post_retention_days: 90,
safe_dm_mentions: false,
healthcheck: false,
remote_post_retention_days: 90,
- skip_thread_containment: false,
- limit_unauthenticated_to_local_content: true
-
-config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
+ 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
@@
-362,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,
@@
-443,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,
@@
-500,10
+501,14
@@
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}]
+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 environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.