From 19729fb33409d83210e76fd2ee102c6330158469 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Mon, 20 Nov 2023 21:19:24 +0800
Subject: [PATCH] services.gitlab: fix smtp

---
 flake.nix                   | 2 +-
 modules/services/gitlab.nix | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6ca27105..0072dcd7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -274,7 +274,7 @@
                     [ "nix-store" "xn--qbtm095lrg0bfka60z" ]))
                   // (builtins.listToAttrs (builtins.map
                     (site: { name = "${site}.chn.moe"; value.upstream.address = "internal.vps7.chn.moe"; })
-                    [ "xn--s8w913fdga" "misskey" "synapse" "send" "kkmeeting" "api" ]));
+                    [ "xn--s8w913fdga" "misskey" "synapse" "send" "kkmeeting" "api" "gitlab" ]));
                   applications =
                   {
                     element.instances."element.chn.moe" = {};
diff --git a/modules/services/gitlab.nix b/modules/services/gitlab.nix
index a976f05d..86a07d64 100644
--- a/modules/services/gitlab.nix
+++ b/modules/services/gitlab.nix
@@ -21,11 +21,13 @@ inputs:
         smtp =
         {
           enable = true;
+          address = "mail.chn.moe";
           username = "bot@chn.moe";
+          passwordFile = inputs.config.sops.secrets."gitlab/mail".path;
           tls = true;
+          enableStartTLSAuto = false;
           port = 465;
           domain = gitlab.hostname;
-          passwordFile = inputs.config.sops.secrets."gitlab/mail".path;
           authentication = "login";
         };
         secrets =
@@ -36,7 +38,7 @@ inputs:
           dbFile = inputs.config.sops.secrets."gitlab/dbFile".path;
         };
         initialRootPasswordFile = inputs.config.sops.secrets."gitlab/root".path;
-        initialRootEmail = "chn@chn.moe";
+        initialRootEmail = "bot@chn.moe";
         databasePasswordFile = inputs.config.sops.secrets."gitlab/db".path;
         databaseHost = "127.0.0.1";
       };