diff options
| author | tusooa <tusooa@kazv.moe> | 2022-09-05 15:00:19 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-09-05 15:00:19 +0000 |
| commit | 9874b4c985ea715a37cf2d2a5c8db2fb26e28f3a (patch) | |
| tree | e495f10d3cac124d405cfe01015821a930f3a1df /config | |
| parent | e06f2b9f5ea58c90cafd7864a66809fe8ea0a96f (diff) | |
| parent | f8afba95b20670b5d6e93896ccd27bb3fca003a2 (diff) | |
| download | pleroma-9874b4c985ea715a37cf2d2a5c8db2fb26e28f3a.tar.gz pleroma-9874b4c985ea715a37cf2d2a5c8db2fb26e28f3a.zip | |
Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 12 | ||||
| -rw-r--r-- | config/description.exs | 21 |
2 files changed, 32 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 0fc959807..aa53b7653 100644 --- a/config/config.exs +++ b/config/config.exs @@ -673,6 +673,8 @@ config :pleroma, :features, improved_hashtag_timeline: :auto config :pleroma, :populate_hashtags_table, fault_rate_allowance: 0.01 +config :pleroma, :delete_context_objects, fault_rate_allowance: 0.01 + config :pleroma, :env, Mix.env() config :http_signatures, @@ -741,7 +743,7 @@ config :pleroma, :frontends, "name" => "fedi-fe", "git" => "https://git.pleroma.social/pleroma/fedi-fe", "build_url" => - "https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build", + "https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build_release", "ref" => "master", "custom-http-headers" => [ {"service-worker-allowed", "/"} @@ -761,6 +763,14 @@ config :pleroma, :frontends, "https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/${ref}/download?job=build-production", "ref" => "v1.0.0", "build_dir" => "static" + }, + "glitch-lily" => %{ + "name" => "glitch-lily", + "git" => "https://lily-is.land/infra/glitch-lily", + "build_url" => + "https://lily-is.land/infra/glitch-lily/-/jobs/artifacts/${ref}/download?job=build", + "ref" => "servant", + "build_dir" => "public" } } diff --git a/config/description.exs b/config/description.exs index c6c6b1b5d..c28447b37 100644 --- a/config/description.exs +++ b/config/description.exs @@ -497,6 +497,27 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, + key: :delete_context_objects, + type: :group, + description: "`delete_context_objects` background migration settings", + children: [ + %{ + key: :fault_rate_allowance, + type: :float, + description: + "Max accepted rate of objects that failed in the migration. Any value from 0.0 which tolerates no errors to 1.0 which will enable the feature even if context object deletion failed for all records.", + suggestions: [0.01] + }, + %{ + key: :sleep_interval_ms, + type: :integer, + description: + "Sleep interval between each chunk of processed records in order to decrease the load on the system (defaults to 0 and should be keep default on most instances)." + } + ] + }, + %{ + group: :pleroma, key: :instance, type: :group, description: "Instance-related settings", |