projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move `follows`, `mutes` and `blocks` actions to AccountController
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index da89aa3e956074efb02ec43c64161788b08997cc..36bea19a089a51d035c696d2446ba8cf24e426df 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-54,7
+54,7
@@
config :pleroma, Pleroma.Repo,
scheduled_jobs =
with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest],
true <- digest_config[:active] do
scheduled_jobs =
with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest],
true <- digest_config[:active] do
- [{digest_config[:schedule], {Pleroma.D
igestEmailWorker
, :perform, []}}]
+ [{digest_config[:schedule], {Pleroma.D
aemons.DigestEmailDaemon
, :perform, []}}]
else
_ -> []
end
else
_ -> []
end
@@
-109,6
+109,7
@@
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
config :pleroma, Pleroma.Uploaders.S3,
bucket: nil,
config :pleroma, Pleroma.Uploaders.S3,
bucket: nil,
+ streaming_enabled: true,
public_endpoint: "https://s3.amazonaws.com"
config :pleroma, Pleroma.Uploaders.MDII,
public_endpoint: "https://s3.amazonaws.com"
config :pleroma, Pleroma.Uploaders.MDII,
@@
-122,7
+123,8
@@
config :pleroma, :emoji,
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
Custom: ["/emoji/*.png", "/emoji/**/*.png"]
],
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
Custom: ["/emoji/*.png", "/emoji/**/*.png"]
],
- default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"
+ default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json",
+ shared_pack_cache_seconds_per_file: 60
config :pleroma, :uri_schemes,
valid_schemes: [
config :pleroma, :uri_schemes,
valid_schemes: [
@@
-276,7
+278,7
@@
config :pleroma, :instance,
max_account_fields: 10,
max_remote_account_fields: 20,
account_field_name_length: 512,
max_account_fields: 10,
max_remote_account_fields: 20,
account_field_name_length: 512,
- account_field_value_length:
512
,
+ account_field_value_length:
2048
,
external_user_synchronization: true
config :pleroma, :markup,
external_user_synchronization: true
config :pleroma, :markup,
@@
-331,6
+333,10
@@
config :pleroma, :activitypub,
follow_handshake_timeout: 500,
sign_object_fetches: true
follow_handshake_timeout: 500,
sign_object_fetches: true
+config :pleroma, :streamer,
+ workers: 3,
+ overflow_workers: 2
+
config :pleroma, :user, deny_follow_blocked: true
config :pleroma, :mrf_normalize_markup, scrub_policy: Pleroma.HTML.Scrubber.Default
config :pleroma, :user, deny_follow_blocked: true
config :pleroma, :mrf_normalize_markup, scrub_policy: Pleroma.HTML.Scrubber.Default
@@
-391,6
+397,8
@@
config :pleroma, :chat, enabled: true
config :phoenix, :format_encoders, json: Jason
config :phoenix, :format_encoders, json: Jason
+config :phoenix, :json_library, Jason
+
config :pleroma, :gopher,
enabled: false,
ip: {0, 0, 0, 0},
config :pleroma, :gopher,
enabled: false,
ip: {0, 0, 0, 0},
@@
-470,7
+478,7
@@
config :pleroma, Pleroma.User,
config :pleroma, Oban,
repo: Pleroma.Repo,
verbose: false,
config :pleroma, Oban,
repo: Pleroma.Repo,
verbose: false,
- prune: {:max
age, 60 * 60 * 24 * 7
},
+ prune: {:max
len, 1500
},
queues: [
activity_expiration: 10,
federator_incoming: 50,
queues: [
activity_expiration: 10,
federator_incoming: 50,
@@
-501,7
+509,7
@@
config :auto_linker,
class: false,
strip_prefix: false,
new_window: false,
class: false,
strip_prefix: false,
new_window: false,
- rel:
false
+ rel:
"ugc"
]
config :pleroma, :ldap,
]
config :pleroma, :ldap,
@@
-583,6
+591,12
@@
config :pleroma, :rate_limit, nil
config :pleroma, Pleroma.ActivityExpiration, enabled: true
config :pleroma, Pleroma.ActivityExpiration, enabled: true
+config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+
+config :pleroma, :web_cache_ttl,
+ activity_pub: nil,
+ activity_pub_question: 30_000
+
# 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"