services/authelia/configuration.yml

@@ -76,12 +76,12 @@ storage:
 notifier:
   disable_startup_check: true
   smtp:
-    address: 'submissions://mail.gasdev.fr:465'
+    address: 'smtp://mail.gasdev.fr:25'
-    username: 'postmaster'
+    username: 'postmaster@gasdev.fr'
     sender: 'Authelia <authelia@gasdev.fr>'
-    # identifier: 'mail.gasdev.fr'
+    identifier: 'mail.gasdev.fr'
-    # tls:
+    tls:
-    #   server_name: 'mail.gasdev.fr'
+      server_name: 'mail.gasdev.fr'
 
 log:
   level: 'info'

services/outline/default.nix

@@ -30,10 +30,10 @@
     smtp = {
       host = "mail.gasdev.fr";
       port = 465;
-      username = "postmaster";
+      username = "postmaster@gasdev.fr";
       passwordFile = config.sops.secrets."outline/SMTP_PASSWORD".path;
-      fromEmail = "outline@gasdev.fr";
+      fromEmail = "from.outline@gasdev.fr";
-      replyEmail = "no-reply@gasdev.fr";
+      replyEmail = "reply.outline@gasdev.fr";
     };
 
     storage = {

services/stalwart-mail/default.nix

@@ -5,11 +5,6 @@ in {
   sops.secrets."stalwart-mail/ACME_SECRET".owner = "stalwart-mail";
 
   services.caddy.virtualHosts."mailadmin.${domain}" = {
-    extraConfig = ''
-      reverse_proxy http://127.0.01:40312
-    '';
-  };
-  services.caddy.virtualHosts."mail.${domain}" = {
     extraConfig = ''
       reverse_proxy http://127.0.01:8080
     '';
@@ -17,7 +12,7 @@ in {
       "mta-sts.${domain}"
       "autoconfig.${domain}"
       "autodiscover.${domain}"
-      "${domain}"
+      "mail.${domain}"
     ];
   };
   networking.firewall.allowedTCPPorts = [25 465 587 993];
@@ -26,7 +21,7 @@ in {
     enable = true;
     settings = {
       server = {
-        hostname = "mail.${domain}";
+        hostname = "mx1.${domain}";
         tls = {
           enable = true;
           implicit = true;
@@ -39,36 +34,40 @@ in {
           submissions = {
             bind = "[::]:465";
             protocol = "smtp";
-            tls.implicit = true;
           };
           imaps = {
             bind = "[::]:993";
             protocol = "imap";
-            tls.implicit = true;
           };
           jmap = {
             bind = "[::]:8080";
-            protocol = "http";
+            url = "https://mail.${domain}";
-            tls.implicit = false;
+            protocol = "jmap";
           };
           management = {
-            bind = ["127.0.0.1:40312"];
+            bind = ["127.0.0.1:8080"];
             protocol = "http";
           };
         };
       };
       lookup.default = {
-        hostname = "mail.${domain}";
+        hostname = "mx1.${domain}";
         domain = "${domain}";
       };
-      certificate.default = {
+      acme."letsencrypt" = {
-        default = true;
+        directory = "https://acme-v02.api.letsencrypt.org/directory";
-        cert = "%{file:/var/lib/stalwart-mail/cert/mail.${domain}.pem}%";
+        challenge = "dns-01";
-        private-key = "%{file:/var/lib/stalwart-mail/cert/mail.${domain}.priv.pem}%";
+        contact = "postmaster@${domain}";
+        domains = ["${domain}" "mx1.${domain}"];
+        provider = "cloudflare";
+        secret = "%{file:${config.sops.secrets."stalwart-mail/ACME_SECRET".path}}%";
       };
       session.auth = {
-        mechanisms = "[plain, login]";
+        mechanisms = "[plain]";
+        directory = "'in-memory'";
       };
+      session.rcpt.directory = "'in-memory'";
+      queue.outbound.next-hop = "'local'";
       directory."imap".lookup.domains = ["${domain}"];
       storage = {
         data = "rocksdb";
@@ -92,11 +91,6 @@ in {
         ansi = false;
         enable = true;
       };
-      tracer."journal" = {
-        type = "journal";
-        level = "info";
-        enable = true;
-      };
       authentication."fallback-admin" = {
         user = "admin";
         secret = "%{file:${config.sops.secrets."stalwart-mail/ADMIN_SECRET".path}}%";
@@ -113,35 +107,4 @@ in {
       StateDirectoryMode = "0740";
     };
   };
-
-  systemd.timers."stalwart-mail-update-certs" = {
-    wantedBy = ["timers.target"];
-    timerConfig = {
-      OnCalendar = "daily";
-      Persistent = true;
-      Unit = "stalwart-mail-update-certs.service";
-    };
-  };
-
-  systemd.services."stalwart-mail-update-certs" = {
-    script = ''
-      set -eu
-
-      CADDY_CERT_DIR="/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/mail.${domain}"
-      STALWART_CERT_DIR="/var/lib/stalwart-mail/cert"
-
-      mkdir -p "''\${CADDY_CERT_DIR}"
-      mkdir -p "''\${STALWART_CERT_DIR}"
-
-      cat "''\${CADDY_CERT_DIR}/mail.${domain}.crt" > "''\${STALWART_CERT_DIR}/mail.${domain}.pem"
-      cat "''\${CADDY_CERT_DIR}/mail.${domain}.key" > "''\${STALWART_CERT_DIR}/mail.${domain}.priv.pem"
-
-      chown -R stalwart-mail:stalwart-mail "''\${STALWART_CERT_DIR}"
-      chmod -R 0700 "''\${STALWART_CERT_DIR}"
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-    };
-  };
 }