projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/rich-media' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 11ee220e737b2054f04f733059164fdee6558e41..601d9e22765c2d71d963879a7b06889d138e6c90 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-12,7
+12,7
@@
config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
config :pleroma, Pleroma.Captcha,
enabled: false,
config :pleroma, Pleroma.Captcha,
enabled: false,
- seconds_
retained: 18
0,
+ seconds_
valid: 6
0,
method: Pleroma.Captcha.Kocaptcha
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
method: Pleroma.Captcha.Kocaptcha
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
@@
-186,13
+186,7
@@
config :pleroma, :mrf_simple,
reject: [],
accept: []
reject: [],
accept: []
-config :pleroma, :media_proxy,
- enabled: false,
- # base_url: "https://cache.pleroma.social",
- proxy_opts: [
- # inline_content_types: [] | false | true,
- # http: [:insecure]
- ]
+config :pleroma, :media_proxy, enabled: false
config :pleroma, :chat, enabled: true
config :pleroma, :chat, enabled: true