projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index c3301b2edb1288c701e1c2211cc0ef5f7abc4d7f..09c3be7de3e42130faa61dbdba381dd6ce5f5aea 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-184,9
+184,6
@@
config :mime, :types, %{
"application/ld+json" => ["activity+json"]
}
"application/ld+json" => ["activity+json"]
}
-config :pleroma, :websub, Pleroma.Web.Websub
-config :pleroma, :ostatus, Pleroma.Web.OStatus
-config :pleroma, :httpoison, Pleroma.HTTP
config :tesla, adapter: Tesla.Adapter.Hackney
# Configures http settings, upstream proxy etc.
config :tesla, adapter: Tesla.Adapter.Hackney
# Configures http settings, upstream proxy etc.
@@
-211,6
+208,12
@@
config :pleroma, :instance,
avatar_upload_limit: 2_000_000,
background_upload_limit: 4_000_000,
banner_upload_limit: 4_000_000,
avatar_upload_limit: 2_000_000,
background_upload_limit: 4_000_000,
banner_upload_limit: 4_000_000,
+ poll_limits: %{
+ max_options: 20,
+ max_option_chars: 200,
+ min_expiration: 0,
+ max_expiration: 365 * 24 * 60 * 60
+ },
registrations_open: true,
federating: true,
federation_reachability_timeout_days: 7,
registrations_open: true,
federating: true,
federation_reachability_timeout_days: 7,
@@
-239,7
+242,8
@@
config :pleroma, :instance,
welcome_message: nil,
max_report_comment_size: 1000,
safe_dm_mentions: false,
welcome_message: nil,
max_report_comment_size: 1000,
safe_dm_mentions: false,
- healthcheck: false
+ healthcheck: false,
+ remote_post_retention_days: 90
config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
@@
-313,7
+317,9
@@
config :pleroma, :mrf_simple,
federated_timeline_removal: [],
report_removal: [],
reject: [],
federated_timeline_removal: [],
report_removal: [],
reject: [],
- accept: []
+ accept: [],
+ avatar_removal: [],
+ banner_removal: []
config :pleroma, :mrf_keyword,
reject: [],
config :pleroma, :mrf_keyword,
reject: [],
@@
-480,7
+486,9
@@
config :pleroma, Pleroma.ScheduledActivity,
config :pleroma, :oauth2,
token_expires_in: 600,
config :pleroma, :oauth2,
token_expires_in: 600,
- issue_new_refresh_token: true
+ issue_new_refresh_token: true,
+ clean_expired_tokens: false,
+ clean_expired_tokens_interval: 86_400_000
config :pleroma, :database, rum_enabled: false
config :pleroma, :database, rum_enabled: false