projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 1e36d3314bfdd8d9eed0381d6afd62d5120bf00b..31221b914fcfb6f6b6e9c9c8184a1072ed4acdfe 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-66,9
+66,11
@@
config :pleroma, Pleroma.Scheduler,
jobs: scheduled_jobs
config :pleroma, Pleroma.Captcha,
jobs: scheduled_jobs
config :pleroma, Pleroma.Captcha,
- enabled: false,
- seconds_valid: 60,
- method: Pleroma.Captcha.Kocaptcha
+ enabled: true,
+ seconds_valid: 300,
+ method: Pleroma.Captcha.Native
+
+config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
config :pleroma, :hackney_pools,
federation: [
config :pleroma, :hackney_pools,
federation: [
@@
-84,8
+86,6
@@
config :pleroma, :hackney_pools,
timeout: 300_000
]
timeout: 300_000
]
-config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
-
# Upload configuration
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,
# Upload configuration
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,
@@
-108,10
+108,6
@@
config :pleroma, Pleroma.Uploaders.S3,
streaming_enabled: true,
public_endpoint: "https://s3.amazonaws.com"
streaming_enabled: true,
public_endpoint: "https://s3.amazonaws.com"
-config :pleroma, Pleroma.Uploaders.MDII,
- cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi",
- files: "https://mdii.sakura.ne.jp"
-
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
pack_extensions: [".png", ".gif"],
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
pack_extensions: [".png", ".gif"],
@@
-209,6
+205,7
@@
config :tesla, adapter: Tesla.Adapter.Hackney
config :pleroma, :http,
proxy_url: nil,
send_user_agent: true,
config :pleroma, :http,
proxy_url: nil,
send_user_agent: true,
+ user_agent: :default,
adapter: [
ssl_options: [
# Workaround for remote server certificate chain issues
adapter: [
ssl_options: [
# Workaround for remote server certificate chain issues
@@
-224,6
+221,7
@@
config :pleroma, :instance,
notify_email: "noreply@example.com",
description: "A Pleroma instance, an alternative fediverse server",
limit: 5_000,
notify_email: "noreply@example.com",
description: "A Pleroma instance, an alternative fediverse server",
limit: 5_000,
+ chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
@@
-256,6
+254,7
@@
config :pleroma, :instance,
],
mrf_transparency: true,
mrf_transparency_exclusions: [],
],
mrf_transparency: true,
mrf_transparency_exclusions: [],
+ staff_transparency: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
no_attachment_links: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
no_attachment_links: true,
@@
-561,7
+560,10
@@
config :ueberauth,
base_path: "/oauth",
providers: ueberauth_providers
base_path: "/oauth",
providers: ueberauth_providers
-config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies
+config :pleroma,
+ :auth,
+ enforce_oauth_admin_scope_usage: true,
+ oauth_consumer_strategies: oauth_consumer_strategies
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
@@
-616,6
+618,8
@@
config :pleroma, :web_cache_ttl,
activity_pub: nil,
activity_pub_question: 30_000
activity_pub: nil,
activity_pub_question: 30_000
+config :pleroma, :modules, runtime_dir: "instance/modules"
+
config :swarm, node_blacklist: [~r/myhtml_.*$/]
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
config :swarm, node_blacklist: [~r/myhtml_.*$/]
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.