From bde18cd5b72629f0eea4cd8904f6b772830fa9fd Mon Sep 17 00:00:00 2001 From: imterah Date: Wed, 7 May 2025 20:46:38 -0400 Subject: [PATCH] feature: Adds Captcha authentication to Forgejo --- hosts/andromeda/stacks/forgejo/docker-compose.nix | 7 +++++++ hosts/andromeda/stacks/mcaptcha/docker-compose.nix | 3 --- secrets | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hosts/andromeda/stacks/forgejo/docker-compose.nix b/hosts/andromeda/stacks/forgejo/docker-compose.nix index 6b961dd..07dfc30 100644 --- a/hosts/andromeda/stacks/forgejo/docker-compose.nix +++ b/hosts/andromeda/stacks/forgejo/docker-compose.nix @@ -87,6 +87,13 @@ "FORGEJO__database__HOST" = "db:5432"; "FORGEJO__database__NAME" = "forgejo"; "FORGEJO__database__USER" = "forgejo"; + "FORGEJO__service__REGISTER_EMAIL_CONFIRM" = "false"; + "FORGEJO__service__REQUIRE_CAPTCHA_FOR_LOGIN" = "true"; + "FORGEJO__service__MCAPTCHA_URL" = "https://mcaptcha.terah.dev"; + "FORGEJO__service__CAPTCHA_TYPE" = "CAPTCHA_TYPE"; + "FORGEJO__service__ENABLE_CAPTCHA" = "true"; + "FORGEJO__service__REGISTER_MANUAL_CONFIRM" = "true"; + "FORGEJO__service__REQUIRE_EXTERNAL_REGISTRATION_CAPTCHA" = "true"; "USER_GID" = "1000"; "USER_UID" = "1000"; }; diff --git a/hosts/andromeda/stacks/mcaptcha/docker-compose.nix b/hosts/andromeda/stacks/mcaptcha/docker-compose.nix index e826d92..3676bfd 100644 --- a/hosts/andromeda/stacks/mcaptcha/docker-compose.nix +++ b/hosts/andromeda/stacks/mcaptcha/docker-compose.nix @@ -101,9 +101,6 @@ "MCAPTCHA_source_code" = "https://github.com/mCaptcha/mCaptcha"; "PORT" = "7000"; }; - ports = [ - "7000:7000/tcp" - ]; dependsOn = [ "mcaptcha-cache" "mcaptcha-db" diff --git a/secrets b/secrets index 641331a..fb03516 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit 641331a16088e444d4d22ac421916b5bde369f89 +Subproject commit fb03516cae9a47fa26a88af5eb5a158d2f37d1df