From ca4630caa90c8cc76687a3ccb76b4b4f16b20d5a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 1 Jul 2019 23:49:29 +0200
Subject: [PATCH] Add 465 port for mail submission

---
 modules/private/mail/postfix.nix                   | 11 ++++++++++-
 modules/private/websites/tools/mail/www/index.html |  5 +++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix
index dfe6129..ee4ac35 100644
--- a/modules/private/mail/postfix.nix
+++ b/modules/private/mail/postfix.nix
@@ -77,7 +77,7 @@
     }
   ];
 
-  config.networking.firewall.allowedTCPPorts = [ 25 587 ];
+  config.networking.firewall.allowedTCPPorts = [ 25 465 587 ];
 
   config.nixpkgs.overlays = [ (self: super: {
     postfix = super.postfix.override { withMySQL = true; };
@@ -205,6 +205,15 @@
     sslKey = "/var/lib/acme/mail/key.pem";
     recipientDelimiter = "+";
     masterConfig = {
+      submissions = {
+        type = "inet";
+        private = false;
+        command = "smtpd";
+        args = ["-o" "smtpd_tls_wrappermode=yes" ] ++ (let
+          mkKeyVal = opt: val: [ "-o" (opt + "=" + val) ];
+        in lib.concatLists (lib.mapAttrsToList mkKeyVal config.services.postfix.submissionOptions)
+        );
+      };
       dovecot = {
         type = "unix";
         privileged = true;
diff --git a/modules/private/websites/tools/mail/www/index.html b/modules/private/websites/tools/mail/www/index.html
index 3727c42..88b0ebd 100644
--- a/modules/private/websites/tools/mail/www/index.html
+++ b/modules/private/websites/tools/mail/www/index.html
@@ -37,14 +37,14 @@
         <li>IMAP: <span class="code">imap.immae.eu</span>
           <ul>
             <li>No unencrypted access</li>
-            <li>STARTTLS: 143 (recommended)</li>
+            <li>STARTTLS: 143</li>
             <li>SSL: 993</li>
           </ul>
         </li>
         <li>POP3: <span class="code">pop3.immae.eu</span>
           <ul>
             <li>No unencrypted access</li>
-            <li>STARTTLS: 110 (recommended)</li>
+            <li>STARTTLS: 110</li>
             <li>SSL: 995</li>
           </ul>
         </li>
@@ -52,6 +52,7 @@
           <ul>
             <li>No unencrypted access</li>
             <li>STARTTLS: 587</li>
+            <li>SSL: 465</li>
           </ul>
         </li>
         <li>Sieve: <span class="code">imap.immae.eu</span>
-- 
2.41.0