projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CommonAPI: Don't error out on double favs/repeats
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 370ddd855063b801c1ee4c198484a43a0c68f44c..b0036fff049c0c32bdfa7afcf22759ddefdc860b 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-67,9
+67,11
@@
config :pleroma, Pleroma.Scheduler,
config :pleroma, Pleroma.Captcha,
enabled: true,
config :pleroma, Pleroma.Captcha,
enabled: true,
- seconds_valid:
6
0,
+ seconds_valid:
30
0,
method: Pleroma.Captcha.Native
method: Pleroma.Captcha.Native
+config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
+
config :pleroma, :hackney_pools,
federation: [
max_connections: 50,
config :pleroma, :hackney_pools,
federation: [
max_connections: 50,
@@
-106,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"],
@@
-563,7
+561,7
@@
config :ueberauth,
config :pleroma,
:auth,
config :pleroma,
:auth,
- enforce_oauth_admin_scope_usage:
fals
e,
+ enforce_oauth_admin_scope_usage:
tru
e,
oauth_consumer_strategies: oauth_consumer_strategies
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
oauth_consumer_strategies: oauth_consumer_strategies
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
@@
-619,6
+617,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.