From 666e6b4425741ac4629518281ab3195c4acbb725 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Wed, 31 May 2023 14:58:26 +0200
Subject: [PATCH] enable submission on port 587

---
 modules/mail.nix    | 3 ++-
 modules/mailman.nix | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/mail.nix b/modules/mail.nix
index 2491c4d..408c03a 100644
--- a/modules/mail.nix
+++ b/modules/mail.nix
@@ -27,12 +27,13 @@ in
   sops.secrets."rspamd-password".owner = config.users.users.rspamd.name;
   sops.secrets."dovecot_ldap_search".owner = config.services.dovecot2.user;
 
-  networking.firewall.allowedTCPPorts = [ 25 465 993 ];
+  networking.firewall.allowedTCPPorts = [ 25 465 587 993 ];
   users.users.postfix.extraGroups = [ "opendkim" ];
 
   services = {
     postfix = {
       enable = true;
+      enableSubmission = true;
       enableSubmissions = true;
       hostname = "${hostname}";
       domain = "${domain}";
diff --git a/modules/mailman.nix b/modules/mailman.nix
index 1841e53..e0cfc4c 100644
--- a/modules/mailman.nix
+++ b/modules/mailman.nix
@@ -12,7 +12,7 @@
     enablePostfix = true;
     siteOwner = "mailman@${config.fsr.domain}";
     settings = {
-      mta.smtp_secure_mode = "SecureMode.SMTPS";
+      mta.smtp_secure_mode = "SecureMode.STARTTLS";
     };
     ldap = {
       enable = true;