projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/raise-registration-api-ratelimit' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 9f2244222da3f36b1a7c25cba0bbb561ae91e883..32c7fecb8403ba0d1343a4d081b373f2914d7e4a 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-212,6
+212,11
@@
config :pleroma, :instance,
registrations_open: true,
federating: true,
federation_reachability_timeout_days: 7,
registrations_open: true,
federating: true,
federation_reachability_timeout_days: 7,
+ federation_publisher_modules: [
+ Pleroma.Web.ActivityPub.Publisher,
+ Pleroma.Web.Websub,
+ Pleroma.Web.Salmon
+ ],
allow_relay: true,
rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
public: true,
allow_relay: true,
rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
public: true,
@@
-221,7
+226,8
@@
config :pleroma, :instance,
allowed_post_formats: [
"text/plain",
"text/html",
allowed_post_formats: [
"text/plain",
"text/html",
- "text/markdown"
+ "text/markdown",
+ "text/bbcode"
],
mrf_transparency: true,
autofollowed_nicknames: [],
],
mrf_transparency: true,
autofollowed_nicknames: [],
@@
-230,7
+236,10
@@
config :pleroma, :instance,
welcome_user_nickname: nil,
welcome_message: nil,
max_report_comment_size: 1000,
welcome_user_nickname: nil,
welcome_message: nil,
max_report_comment_size: 1000,
- safe_dm_mentions: false
+ safe_dm_mentions: false,
+ healthcheck: false
+
+config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
@@
-325,7
+334,8
@@
config :pleroma, :media_proxy,
follow_redirect: true,
pool: :media
]
follow_redirect: true,
pool: :media
]
- ]
+ ],
+ whitelist: []
config :pleroma, :chat, enabled: true
config :pleroma, :chat, enabled: true
@@
-413,7
+423,9
@@
config :pleroma_job_queue, :queues,
web_push: 50,
mailer: 10,
transmogrifier: 20,
web_push: 50,
mailer: 10,
transmogrifier: 20,
- scheduled_activities: 10
+ scheduled_activities: 10,
+ background: 5,
+ user: 10
config :pleroma, :fetch_initial_posts,
enabled: false,
config :pleroma, :fetch_initial_posts,
enabled: false,
@@
-440,6
+452,9
@@
config :pleroma, :ldap,
base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
uid: System.get_env("LDAP_UID") || "cn"
base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
uid: System.get_env("LDAP_UID") || "cn"
+config :esshd,
+ enabled: false
+
oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "")
ueberauth_providers =
oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "")
ueberauth_providers =
@@
-465,6
+480,10
@@
config :pleroma, Pleroma.ScheduledActivity,
total_user_limit: 300,
enabled: true
total_user_limit: 300,
enabled: true
+config :pleroma, :oauth2,
+ token_expires_in: 600,
+ issue_new_refresh_token: true
+
# 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"