Fix immae.eu monitoring

diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix
index d8640f8d57c66370266c48471d59446ceb9f3d67..40a95774c40a5b8ba71ebabf6f117b358174dada 100644 (file)
--- 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 70459fc4032be276d0d4cc40c5d58e31c98a4b04..96f91aaa07ede5f8d567b043401e7214353e10e8 100644 (file)
--- a/modules/private/monitoring/objects_immae-eu.nix
+++ b/modules/private/monitoring/objects_immae-eu.nix
@@ -52,11 +52,6 @@ in
       service_description = "ssh connexion responds";
     }
 
-    {
-      service_description = "fail2ban is active";
-      servicegroups = "webstatus-resources";
-    }
-
     {
       service_description = "pacman packages are not too old";
       servicegroups = "webstatus-resources";
@@ -64,10 +59,6 @@ in
       notification_interval = "0";
     }
 
-    {
-      service_description = "postfix service is active";
-    }
-
     {
       service_description = "tinc@Immae service is active";
     }
@@ -75,10 +66,5 @@ in
     {
       service_description = "sshd service is active";
     }
-
-    {
-      service_description = "mailq is empty";
-      servicegroups = "webstatus-email";
-    }
   ];
 }