From 134ad553899270f2adecdae8da60ce14c5498cf6 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 19 Aug 2024 23:19:04 +0200 Subject: [PATCH] dd --- roles/mgrote_munin_server/defaults/main.yml | 2 +- roles/mgrote_munin_server/templates/munin.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mgrote_munin_server/defaults/main.yml b/roles/mgrote_munin_server/defaults/main.yml index 13509f1e..3cabb5c7 100644 --- a/roles/mgrote_munin_server/defaults/main.yml +++ b/roles/mgrote_munin_server/defaults/main.yml @@ -6,12 +6,12 @@ munin_packages: - wget - libapache2-mod-fcgid - libcgi-fast-perl - - ssmtp - perl - mailutils - curl - tzdata - munin-node + - s-nail - libfile-readbackwards-perl munin_servername: "{{ ansible_fqdn }}.mgrote.net" munin_dirs: diff --git a/roles/mgrote_munin_server/templates/munin.conf b/roles/mgrote_munin_server/templates/munin.conf index 1d8effa0..5924073b 100644 --- a/roles/mgrote_munin_server/templates/munin.conf +++ b/roles/mgrote_munin_server/templates/munin.conf @@ -91,7 +91,7 @@ html_strategy {{ munin_mode }} # something changes (OK -> WARNING, CRITICAL -> OK, etc) # test with: sudo -u munin /usr/share/munin/munin-limits --contact someuser --force {% if munin_enable_alerts is sameas true %} -contact.someuser.command mail -aFROM:munin@mgrote.net -s "Munin ${var:worst}: ${var:group}::${var:host}::${var:plugin}" {{ munin_alerts_to }} +contact.someuser.command s-nail --set=from='munin@mgrote.net' -s "Munin ${var:worst}: ${var:group}::${var:host}::${var:plugin}" {{ munin_alerts_to }} {% endif %} #contact.anotheruser.command mail -s "Munin ${var:worst}: ${var:group}::${var:host}::${var:plugin}" anotheruser@blibb.comm #