projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not pass transient undo-y activities through MRF
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index f586e3883ef5270c928e0ac7b426b9609c45a93d..4d6150634fc6033176e0914ef6db424eeab0c719 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-180,6
+180,8
@@
config :tesla, :adapter, {Tesla.Adapter.Finch, name: MyFinch}
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
+ pool_timeout: :timer.seconds(5),
+ receive_timeout: :timer.seconds(15),
proxy_url: nil,
user_agent: :default,
adapter: []
proxy_url: nil,
user_agent: :default,
adapter: []
@@
-215,7
+217,7
@@
config :pleroma, :instance,
federation_publisher_modules: [
Pleroma.Web.ActivityPub.Publisher
],
federation_publisher_modules: [
Pleroma.Web.ActivityPub.Publisher
],
- allow_relay:
tru
e,
+ allow_relay:
fals
e,
public: true,
static_dir: "instance/static/",
allowed_post_formats: [
public: true,
static_dir: "instance/static/",
allowed_post_formats: [
@@
-312,7
+314,6
@@
config :pleroma, :frontend_configurations,
logo: "/static/logo.svg",
logoMargin: ".1em",
logoMask: true,
logo: "/static/logo.svg",
logoMargin: ".1em",
logoMask: true,
- minimalScopesMode: false,
noAttachmentLinks: false,
nsfwCensorImage: "",
postContentType: "text/plain",
noAttachmentLinks: false,
nsfwCensorImage: "",
postContentType: "text/plain",
@@
-324,7
+325,8
@@
config :pleroma, :frontend_configurations,
showInstanceSpecificPanel: false,
subjectLineBehavior: "email",
theme: "pleroma-dark",
showInstanceSpecificPanel: false,
subjectLineBehavior: "email",
theme: "pleroma-dark",
- webPushNotifications: false
+ webPushNotifications: false,
+ conversationDisplay: "linear"
},
masto_fe: %{
showInstanceSpecificPanel: true
},
masto_fe: %{
showInstanceSpecificPanel: true
@@
-389,7
+391,8
@@
config :pleroma, :mrf_simple,
accept: [],
avatar_removal: [],
banner_removal: [],
accept: [],
avatar_removal: [],
banner_removal: [],
- reject_deletes: []
+ reject_deletes: [],
+ handle_threads: true
config :pleroma, :mrf_keyword,
reject: [],
config :pleroma, :mrf_keyword,
reject: [],
@@
-567,7
+570,8
@@
config :pleroma, Oban,
new_users_digest: 1,
mute_expire: 5,
search_indexing: 10,
new_users_digest: 1,
mute_expire: 5,
search_indexing: 10,
- nodeinfo_fetcher: 1
+ nodeinfo_fetcher: 1,
+ database_prune: 1
],
plugins: [
Oban.Plugins.Pruner,
],
plugins: [
Oban.Plugins.Pruner,
@@
-575,7
+579,8
@@
config :pleroma, Oban,
],
crontab: [
{"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
],
crontab: [
{"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
- {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
+ {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker},
+ {"0 3 * * *", Pleroma.Workers.Cron.PruneDatabaseWorker}
]
config :pleroma, :workers,
]
config :pleroma, :workers,
@@
-603,7
+608,8
@@
config :pleroma, :workers,
new_users_digest: :timer.seconds(10),
mute_expire: :timer.seconds(5),
search_indexing: :timer.seconds(5),
new_users_digest: :timer.seconds(10),
mute_expire: :timer.seconds(5),
search_indexing: :timer.seconds(5),
- nodeinfo_fetcher: :timer.seconds(10)
+ nodeinfo_fetcher: :timer.seconds(10),
+ database_prune: :timer.minutes(10)
]
config :pleroma, Pleroma.Formatter,
]
config :pleroma, Pleroma.Formatter,