diff options
-rw-r--r-- | modules/private/mail/postfix.nix | 2 | ||||
-rw-r--r-- | modules/private/monitoring/objects_immae-eu.nix | 14 |
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 @@ | |||
274 | in pkgs.writeText "host-sender-login" | 274 | in pkgs.writeText "host-sender-login" |
275 | (builtins.concatStringsSep "\n" (mapAttrsToList (n: v: "${n} ${joined v}") addresses)); | 275 | (builtins.concatStringsSep "\n" (mapAttrsToList (n: v: "${n} ${joined v}") addresses)); |
276 | host_dummy_mailboxes = pkgs.writeText "host-virtual-mailbox" | 276 | host_dummy_mailboxes = pkgs.writeText "host-virtual-mailbox" |
277 | (builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList (n: v: "${n}@immae.eu dummy") nodes)); | 277 | (builtins.concatStringsSep "\n" (["immae-eu@immae.eu dummy"] ++ lib.attrsets.mapAttrsToList (n: v: "${n}@immae.eu dummy") nodes)); |
278 | }; | 278 | }; |
279 | in | 279 | in |
280 | recipient_maps // relay_restrictions // virtual_map // sasl_access; | 280 | 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 | |||
53 | } | 53 | } |
54 | 54 | ||
55 | { | 55 | { |
56 | service_description = "fail2ban is active"; | ||
57 | servicegroups = "webstatus-resources"; | ||
58 | } | ||
59 | |||
60 | { | ||
61 | service_description = "pacman packages are not too old"; | 56 | service_description = "pacman packages are not too old"; |
62 | servicegroups = "webstatus-resources"; | 57 | servicegroups = "webstatus-resources"; |
63 | freshness_threshold = "10800"; | 58 | freshness_threshold = "10800"; |
@@ -65,20 +60,11 @@ in | |||
65 | } | 60 | } |
66 | 61 | ||
67 | { | 62 | { |
68 | service_description = "postfix service is active"; | ||
69 | } | ||
70 | |||
71 | { | ||
72 | service_description = "tinc@Immae service is active"; | 63 | service_description = "tinc@Immae service is active"; |
73 | } | 64 | } |
74 | 65 | ||
75 | { | 66 | { |
76 | service_description = "sshd service is active"; | 67 | service_description = "sshd service is active"; |
77 | } | 68 | } |
78 | |||
79 | { | ||
80 | service_description = "mailq is empty"; | ||
81 | servicegroups = "webstatus-email"; | ||
82 | } | ||
83 | ]; | 69 | ]; |
84 | } | 70 | } |