From ce5bb46fa899b26cc75dadd3162f8751161e1100 Mon Sep 17 00:00:00 2001
From: schweby <git@schwe.by>
Date: Sun, 10 Jul 2022 15:24:53 +0200
Subject: [PATCH] mail: force explicit TLS on SMTP too

also switch away from legacy ports
---
 services/gitlab.nix      | 2 +-
 services/mail.nix        | 1 +
 services/vaultwarden.nix | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/gitlab.nix b/services/gitlab.nix
index 5de66be..03140c0 100644
--- a/services/gitlab.nix
+++ b/services/gitlab.nix
@@ -53,7 +53,7 @@
         smtp = {
           enable = true;
           address = "mail.hacc.space";
-          port = 587;
+          port = 465;
           authentication = "plain";
           domain = "gitlab.infra4future.de";
           enableStartTLSAuto = true;
diff --git a/services/mail.nix b/services/mail.nix
index 5d4c0d7..3297541 100644
--- a/services/mail.nix
+++ b/services/mail.nix
@@ -132,6 +132,7 @@
     # Only allow implict TLS
     enableImap = false;
     enablePop3 = false;
+    enableSubmission = false;
 
     # Enable the ManageSieve protocol
     enableManageSieve = true;
diff --git a/services/vaultwarden.nix b/services/vaultwarden.nix
index 38fb26b..fb8a4ef 100644
--- a/services/vaultwarden.nix
+++ b/services/vaultwarden.nix
@@ -23,7 +23,7 @@
       SMTP_HOST="mail.hacc.space";
       SMTP_FROM="vaultwarden@hacc.space";
       SMTP_FROM_NAME="haccwarden";
-      SMTP_PORT=587;
+      SMTP_PORT=465;
       SMTP_USERNAME="noreply@infra4future.de";
 
     };