Fix immae.eu monitoring

2 files changed, 1 insertions, 15 deletions

diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix
index d8640f8..40a9577 100644
--- a/modules/private/mail/postfix.nix
+++ b/modules/private/mail/postfix.nix
@@ -274,7 +274,7 @@
           in pkgs.writeText "host-sender-login"
             (builtins.concatStringsSep "\n" (mapAttrsToList (n: v: "${n} ${joined v}") addresses));
           host_dummy_mailboxes = pkgs.writeText "host-virtual-mailbox"
-            (builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList (n: v: "${n}@immae.eu  dummy") nodes));
+            (builtins.concatStringsSep "\n" (["immae-eu@immae.eu dummy"] ++ lib.attrsets.mapAttrsToList (n: v: "${n}@immae.eu  dummy") nodes));
         };
       in
         recipient_maps // relay_restrictions // virtual_map // sasl_access;
diff --git a/modules/private/monitoring/objects_immae-eu.nix b/modules/private/monitoring/objects_immae-eu.nix
index 70459fc..96f91aa 100644
--- a/modules/private/monitoring/objects_immae-eu.nix
+++ b/modules/private/monitoring/objects_immae-eu.nix
@@ -53,11 +53,6 @@ in
     }
 
     {
-      service_description = "fail2ban is active";
-      servicegroups = "webstatus-resources";
-    }
-
-    {
       service_description = "pacman packages are not too old";
       servicegroups = "webstatus-resources";
       freshness_threshold = "10800";
@@ -65,20 +60,11 @@ in
     }
 
     {
-      service_description = "postfix service is active";
-    }
-
-    {
       service_description = "tinc@Immae service is active";
     }
 
     {
       service_description = "sshd service is active";
     }
-
-    {
-      service_description = "mailq is empty";
-      servicegroups = "webstatus-email";
-    }
   ];
 }