From ccb8bab471a25fe21caff2f66309be7dc44d3b14 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 19 Jan 2020 18:31:27 +0100
Subject: [PATCH] Remove smtpd for immae-eu

---
 modules/private/mail/postfix.nix                | 11 ++---------
 modules/private/mail/relay.nix                  | 11 ++---------
 modules/private/monitoring/objects_immae-eu.nix |  4 ----
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix
index 2af1849..d8640f8 100644
--- a/modules/private/mail/postfix.nix
+++ b/modules/private/mail/postfix.nix
@@ -292,7 +292,7 @@
         ### Virtual mailboxes config
         virtual_alias_maps = "hash:/etc/postfix/virtual mysql:${config.secrets.fullPaths."postfix/mysql_alias_maps"} ldap:${config.secrets.fullPaths."postfix/ldap_ejabberd_users_immae_fr"}";
         virtual_mailbox_domains = config.myEnv.mail.postfix.additional_mailbox_domains
-        ++ lib.remove "localhost.immae.eu" (lib.remove null (lib.flatten (map
+        ++ lib.remove null (lib.flatten (map
             (zone: map
               (e: if e.receive
               then "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}"
@@ -301,7 +301,7 @@
               (zone.withEmail or [])
             )
             config.myEnv.dns.masterZones
-          )));
+          ));
         virtual_mailbox_maps = "hash:/etc/postfix/host_dummy_mailboxes mysql:${config.secrets.fullPaths."postfix/mysql_mailbox_maps"}";
         dovecot_destination_recipient_limit = "1";
         virtual_transport = "dovecot";
@@ -379,13 +379,6 @@
         milter_macro_daemon_name = "ORIGINATING";
         smtpd_milters = "unix:${config.myServices.mail.milters.sockets.opendkim}";
       };
-      # FIXME: Mail adressed to localhost.immae.eu will still have mx-1 as
-      # prioritized MX, which provokes "mail for localhost.immae.eu loops
-      # back to myself" errors. This transport entry forces to push
-      # e-mails to its right destination.
-      transport = ''
-        localhost.immae.eu   smtp:[immae.eu]:25
-        '';
       destination = ["localhost"];
       # This needs to reverse DNS
       hostname = config.hostEnv.fqdn;
diff --git a/modules/private/mail/relay.nix b/modules/private/mail/relay.nix
index 6ac3df8..18d6bc3 100644
--- a/modules/private/mail/relay.nix
+++ b/modules/private/mail/relay.nix
@@ -161,7 +161,7 @@
         relay_domains = let
           backups = lib.flatten (lib.attrsets.mapAttrsToList (n: v: v.domains or []) config.myEnv.mail.postfix.backup_domains);
           virtual_domains = config.myEnv.mail.postfix.additional_mailbox_domains
-            ++ lib.remove "localhost.immae.eu" (lib.remove null (lib.flatten (map
+            ++ lib.remove null (lib.flatten (map
                 (zone: map
                   (e: if e.receive
                   then "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}"
@@ -170,7 +170,7 @@
                   (zone.withEmail or [])
                 )
                 config.myEnv.dns.masterZones
-              )));
+              ));
         in
           backups ++ virtual_domains;
         relay_recipient_maps = let
@@ -217,13 +217,6 @@
       enable = true;
       enableSmtp = true;
       enableSubmission = false;
-      # FIXME: Mail adressed to localhost.immae.eu will still have mx-1 as
-      # prioritized MX, which provokes "mail for localhost.immae.eu loops
-      # back to myself" errors. This transport entry forces to push
-      # e-mails to its right destination.
-      transport = ''
-        localhost.immae.eu   smtp:[immae.eu]:25
-        '';
       destination = ["localhost"];
       # This needs to reverse DNS
       hostname = config.hostEnv.fqdn;
diff --git a/modules/private/monitoring/objects_immae-eu.nix b/modules/private/monitoring/objects_immae-eu.nix
index cffb180..70459fc 100644
--- a/modules/private/monitoring/objects_immae-eu.nix
+++ b/modules/private/monitoring/objects_immae-eu.nix
@@ -76,10 +76,6 @@ in
       service_description = "sshd service is active";
     }
 
-    {
-      service_description = "postfix SSL is up to date";
-    }
-
     {
       service_description = "mailq is empty";
       servicegroups = "webstatus-email";
-- 
2.41.0