From e6a4cec572fc0a884b28a43a4b5e3fa6a5ee724b Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 12 Aug 2024 16:10:05 +0200 Subject: [PATCH] dd --- docker-compose/postfix/docker-compose.yml.j2 | 1 - roles/mgrote_munin_server/templates/munin.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose/postfix/docker-compose.yml.j2 b/docker-compose/postfix/docker-compose.yml.j2 index 8cec9634..d7c2f394 100644 --- a/docker-compose/postfix/docker-compose.yml.j2 +++ b/docker-compose/postfix/docker-compose.yml.j2 @@ -21,7 +21,6 @@ services: /root@pbs.localdomain/ pbs@mgrote.net /root@pve5.localdomain/ pve5@mgrote.net /no-reply@ubnt.com/ ubiquity@mgrote.net - /mg@munin.localdomain/ munin@mgrote.net # rewrite FROM "nobody@lldap" to "lldap@mgrote.net" # /.*/ würde alle absender adressen ersetzen networks: diff --git a/roles/mgrote_munin_server/templates/munin.conf b/roles/mgrote_munin_server/templates/munin.conf index 45571e64..246440ac 100644 --- a/roles/mgrote_munin_server/templates/munin.conf +++ b/roles/mgrote_munin_server/templates/munin.conf @@ -90,7 +90,7 @@ includedir /etc/munin/munin-conf.d # Drop somejuser@fnord.comm and anotheruser@blibb.comm an email everytime # something changes (OK -> WARNING, CRITICAL -> OK, etc) {% if munin_enable_alerts is sameas true %} -#contact.someuser.command mail -s "Munin ${var:worst}: ${var:group}::${var:host}::${var:plugin}" {{ munin_alerts_to }} +#contact.someuser.command mail -aFROM: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 #