Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (213 commits) Apply 1 suggestion(s) to 1 file(s) ReverseProxy tesla client: remove handling of old_conn ReverseProxy: Fix a gun connection leak when there is an error with no body OpenAPI: remove accidentally pasted buffer data OpenAPI: Replace actor_id by account_id to follow ChatMessage schema Update types in Pleroma.Formatter group added migrate old settings to new Ensure Oban is available during mix tasks. Fixes: mix pleroma.user rm username Fix mix tasks that make HTTP calls by starting the Gun connection pool remove duplicate module Support blocking via query parameters as well and document the change. [#2791] AccountView: renamed `:force` option to `:skip_visibility_check`. added warning to use old keys Update linkify migration tests to use config from ConfigDB Migration to fix malformed Pleroma.Formatter config Refactor require_migration/1 into a test helper function Add AutolinkerToLinkify migration test Fix linkify ConfigDB migration [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting. Add related_policy field ...
This commit is contained in:
commit
e131678d69
379 changed files with 5881 additions and 4588 deletions
|
|
@ -172,7 +172,7 @@ config :mime, :types, %{
|
|||
"application/ld+json" => ["activity+json"]
|
||||
}
|
||||
|
||||
config :tesla, adapter: Tesla.Adapter.Hackney
|
||||
config :tesla, adapter: Tesla.Adapter.Gun
|
||||
|
||||
# Configures http settings, upstream proxy etc.
|
||||
config :pleroma, :http,
|
||||
|
|
@ -222,9 +222,7 @@ config :pleroma, :instance,
|
|||
],
|
||||
autofollowed_nicknames: [],
|
||||
max_pinned_statuses: 1,
|
||||
attachment_links: true,
|
||||
welcome_user_nickname: nil,
|
||||
welcome_message: nil,
|
||||
attachment_links: false,
|
||||
max_report_comment_size: 1000,
|
||||
safe_dm_mentions: false,
|
||||
healthcheck: false,
|
||||
|
|
@ -252,6 +250,20 @@ config :pleroma, :instance,
|
|||
]
|
||||
]
|
||||
|
||||
config :pleroma, :welcome,
|
||||
direct_message: [
|
||||
enabled: false,
|
||||
sender_nickname: nil,
|
||||
message: nil
|
||||
],
|
||||
email: [
|
||||
enabled: false,
|
||||
sender: nil,
|
||||
subject: "Welcome to <%= instance_name %>",
|
||||
html: "Welcome to <%= instance_name %>",
|
||||
text: "Welcome to <%= instance_name %>"
|
||||
]
|
||||
|
||||
config :pleroma, :feed,
|
||||
post_title: %{
|
||||
max_length: 100,
|
||||
|
|
@ -512,8 +524,7 @@ config :pleroma, Pleroma.User,
|
|||
|
||||
config :pleroma, Oban,
|
||||
repo: Pleroma.Repo,
|
||||
verbose: false,
|
||||
prune: {:maxlen, 1500},
|
||||
log: false,
|
||||
queues: [
|
||||
activity_expiration: 10,
|
||||
federator_incoming: 50,
|
||||
|
|
@ -527,6 +538,7 @@ config :pleroma, Oban,
|
|||
attachments_cleanup: 5,
|
||||
new_users_digest: 1
|
||||
],
|
||||
plugins: [Oban.Plugins.Pruner],
|
||||
crontab: [
|
||||
{"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
|
||||
{"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
|
||||
|
|
@ -541,16 +553,14 @@ config :pleroma, :workers,
|
|||
federator_outgoing: 5
|
||||
]
|
||||
|
||||
config :auto_linker,
|
||||
opts: [
|
||||
extra: true,
|
||||
# TODO: Set to :no_scheme when it works properly
|
||||
validate_tld: true,
|
||||
class: false,
|
||||
strip_prefix: false,
|
||||
new_window: false,
|
||||
rel: "ugc"
|
||||
]
|
||||
config :pleroma, Pleroma.Formatter,
|
||||
class: false,
|
||||
rel: "ugc",
|
||||
new_window: false,
|
||||
truncate: false,
|
||||
strip_prefix: false,
|
||||
extra: true,
|
||||
validate_tld: :no_scheme
|
||||
|
||||
config :pleroma, :ldap,
|
||||
enabled: System.get_env("LDAP_ENABLED") == "true",
|
||||
|
|
@ -662,32 +672,30 @@ config :pleroma, Pleroma.Repo,
|
|||
prepare: :unnamed
|
||||
|
||||
config :pleroma, :connections_pool,
|
||||
checkin_timeout: 250,
|
||||
reclaim_multiplier: 0.1,
|
||||
connection_acquisition_wait: 250,
|
||||
connection_acquisition_retries: 5,
|
||||
max_connections: 250,
|
||||
retry: 1,
|
||||
retry_timeout: 1000,
|
||||
max_idle_time: 30_000,
|
||||
retry: 0,
|
||||
await_up_timeout: 5_000
|
||||
|
||||
config :pleroma, :pools,
|
||||
federation: [
|
||||
size: 50,
|
||||
max_overflow: 10,
|
||||
timeout: 150_000
|
||||
max_waiting: 10
|
||||
],
|
||||
media: [
|
||||
size: 50,
|
||||
max_overflow: 10,
|
||||
timeout: 150_000
|
||||
max_waiting: 10
|
||||
],
|
||||
upload: [
|
||||
size: 25,
|
||||
max_overflow: 5,
|
||||
timeout: 300_000
|
||||
max_waiting: 5
|
||||
],
|
||||
default: [
|
||||
size: 10,
|
||||
max_overflow: 2,
|
||||
timeout: 10_000
|
||||
max_waiting: 2
|
||||
]
|
||||
|
||||
config :pleroma, :hackney_pools,
|
||||
|
|
@ -724,6 +732,8 @@ config :tzdata, :http_client, Pleroma.HTTP.Tzdata
|
|||
|
||||
config :ex_aws, http_client: Pleroma.HTTP.ExAws
|
||||
|
||||
config :pleroma, :instances_favicons, enabled: false
|
||||
|
||||
# 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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue