From 89d25fa7a51f3a25d9c7b2504ada10c036f2956e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
 <nicolas.jeannerod@moduscreate.com>
Date: Wed, 27 Nov 2024 13:04:23 +0100
Subject: [PATCH] Set up mailing for Forgejo

---
 infra/vm02116/forgejo.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/infra/vm02116/forgejo.nix b/infra/vm02116/forgejo.nix
index 49bbb32..157e8d6 100644
--- a/infra/vm02116/forgejo.nix
+++ b/infra/vm02116/forgejo.nix
@@ -16,15 +16,19 @@ in
         HTTP_ADDR = "127.0.0.1";
         LANDING_PAGE = "explore";
       };
-      mailer = {
-        ENABLED = true;
-        SMTP_ADDR = "mail.protagio.nl";
-        SMTP_PORT = "587";
-        FROM = "git@fediversity.eu";
-        USER = "git@fediversity.eu";
-      };
     };
-    mailerPasswordFile = "/var/lib/forgejo/data/keys/forgejo-mailpw";
+
+    settings.service.ENABLE_NOTIFY_MAIL = true;
+    settings.mailer = {
+      ENABLED = true;
+      PROTOCOL = "smtp+starttls";
+      SMTP_ADDR = "mail.protagio.nl";
+      SMTP_PORT = "587";
+      FROM = "git@fediversity.eu";
+      USER = "git@fediversity.eu";
+    };
+    secrets.mailer.PASSWD = "/var/lib/forgejo/data/keys/forgejo-mailpw";
+
     database = {
       type = "mysql";
       socket = "/run/mysqld/mysqld.sock";