projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix migration
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 7d70c1a5e58d6450da1cbfc1041a92dad24e52c0..e337f00aaa02a65d46d73b21741db7bfb6f3bfdd 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-99,6
+99,7
@@
config :pleroma, Pleroma.Uploaders.MDII,
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
+ pack_extensions: [".png", ".gif"],
groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
Custom: ["/emoji/*.png", "/emoji/**/*.png"]
groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
Custom: ["/emoji/*.png", "/emoji/**/*.png"]
@@
-139,6
+140,7
@@
config :pleroma, Pleroma.Web.Endpoint,
instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
url: [host: "localhost"],
http: [
instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
url: [host: "localhost"],
http: [
+ ip: {127, 0, 0, 1},
dispatch: [
{:_,
[
dispatch: [
{:_,
[
@@
-167,7
+169,7
@@
config :logger, :console,
config :logger, :ex_syslogger,
level: :debug,
config :logger, :ex_syslogger,
level: :debug,
- ident: "
P
leroma",
+ ident: "
p
leroma",
format: "$metadata[$level] $message",
metadata: [:request_id]
format: "$metadata[$level] $message",
metadata: [:request_id]
@@
-243,9
+245,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
@@
-328,7
+331,10
@@
config :pleroma, :mrf_keyword,
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :mrf_subchain, match_actor: %{}
-config :pleroma, :rich_media, enabled: true
+config :pleroma, :rich_media,
+ enabled: true,
+ ignore_hosts: [],
+ ignore_tld: ["local", "localdomain", "lan"]
config :pleroma, :media_proxy,
enabled: false,
config :pleroma, :media_proxy,
enabled: false,
@@
-360,8
+366,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,
@@
-441,6
+447,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,
@@
-498,9
+506,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"