diff --git a/nix-system-configs/modules/system/mail-server.nix b/nix-system-configs/modules/system/mail-server.nix index d48f4da..5f23077 100644 --- a/nix-system-configs/modules/system/mail-server.nix +++ b/nix-system-configs/modules/system/mail-server.nix @@ -61,7 +61,6 @@ in { "stalwart/cloudflare-username".mode = "0777"; }; - systemd.tmpfiles.rules = [ # z = create/modify file or directory, set mode and owner "z /etc/stalwart 0555 root root - -" diff --git a/nix-system-configs/modules/system/traefik.nix b/nix-system-configs/modules/system/traefik.nix index 6a987d3..13a80fb 100644 --- a/nix-system-configs/modules/system/traefik.nix +++ b/nix-system-configs/modules/system/traefik.nix @@ -267,10 +267,10 @@ in { }; # Mail entrypoints: plain SMTP, implicit SMTPS (465) and IMAPS (993) - #smtp = { - # # plain SMTP (port 25) - TCP passthrough to backend - # address = "[::]:25"; - # }; + smtp = { + # plain SMTP (port 25) - TCP passthrough to backend + address = "[::]:25"; + }; smtps = { # implicit TLS SMTP (port 465) - passthrough to backend address = "[::]:465"; @@ -311,7 +311,7 @@ in { }; # Middleware to strip the /management prefix when proxying to the mail admin mail-strip-management = { - stripPrefix = { prefixes = ["/management"]; }; + stripPrefix = {prefixes = ["/management"];}; }; }; @@ -382,7 +382,7 @@ in { rule = "Host(`mail.prg-radio.org`) && PathPrefix(`/management`)"; service = "mail-webadmin"; entryPoints = ["websecure"]; - tls = { certresolver = "acme"; }; + tls = {certresolver = "acme";}; # strip the /management prefix before proxying to the backend middlewares = ["mail-strip-management"]; }; @@ -516,9 +516,9 @@ in { }; # Mail TCP services - # mail-smtp.loadBalancer = { - # servers = [ { address = "10.1.1.15:25"; } ]; - # }; + mail-smtp.loadBalancer = { + servers = [{address = "10.1.1.15:25";}]; + }; mail-smtps.loadBalancer = { servers = [{address = "10.1.1.15:465";}];