From bf9d631fcaca072ae7adfdc77c78c1e4dfeffc5c Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Wed, 11 Dec 2019 22:29:31 +0700
Subject: Add native captcha and enable it by default.

---
 config/config.exs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 4efadb823..d2f081dd8 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -52,9 +52,9 @@ config :pleroma, Pleroma.Repo,
   migration_lock: nil
 
 config :pleroma, Pleroma.Captcha,
-  enabled: false,
+  enabled: true,
   seconds_valid: 60,
-  method: Pleroma.Captcha.Kocaptcha
+  method: Pleroma.Captcha.Native
 
 config :pleroma, :hackney_pools,
   federation: [
@@ -70,8 +70,6 @@ config :pleroma, :hackney_pools,
     timeout: 300_000
   ]
 
-config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
-
 # Upload configuration
 config :pleroma, Pleroma.Upload,
   uploader: Pleroma.Uploaders.Local,
-- 
cgit v1.2.3


From 3ecdd13bb2af65cfec4600fafe488f37c609a115 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Fri, 13 Dec 2019 22:24:26 +0300
Subject: Add Kocaptcha endpoint to the test config

---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 567780987..8af9584ae 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -93,3 +93,5 @@ else
     "You may want to create test.secret.exs to declare custom database connection parameters."
   )
 end
+
+config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
-- 
cgit v1.2.3