From 10e597f87ee789e9b3d115e6b6afa6f3fee8155a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 25 Jan 2020 16:39:22 +0100 Subject: Fix immae.eu monitoring --- modules/private/mail/postfix.nix | 2 +- modules/private/monitoring/objects_immae-eu.nix | 14 -------------- 2 files changed, 1 insertion(+), 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 @@ -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"; - } ]; } -- cgit v1.2.3