projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/custom-runtime-modules
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 82d62004cf5ee823f2cc46ddd892be7b20bd7ebb..a9bc1b0aa289ee47f3036a157afb07606d663452 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-66,9
+66,9
@@
config :pleroma, Pleroma.Scheduler,
jobs: scheduled_jobs
config :pleroma, Pleroma.Captcha,
jobs: scheduled_jobs
config :pleroma, Pleroma.Captcha,
- enabled:
fals
e,
+ enabled:
tru
e,
seconds_valid: 60,
seconds_valid: 60,
- method: Pleroma.Captcha.
Kocaptcha
+ method: Pleroma.Captcha.
Native
config :pleroma, :hackney_pools,
federation: [
config :pleroma, :hackney_pools,
federation: [
@@
-84,8
+84,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,
@@
-563,7
+561,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: false,
+ 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