aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-03-29 01:14:42 +0000
committerMichael Scherer <misc@mageia.org>2011-03-29 01:14:42 +0000
commit8a7f848c5d6bccc046ee763edc1d0cf0000de4d1 (patch)
tree20163468d4a780ee42d3d871f6c67fd8e6fab943
parent2752fd8cf79605c41dfd283e0f54a0b5f817bd39 (diff)
downloadpuppet-8a7f848c5d6bccc046ee763edc1d0cf0000de4d1.tar
puppet-8a7f848c5d6bccc046ee763edc1d0cf0000de4d1.tar.gz
puppet-8a7f848c5d6bccc046ee763edc1d0cf0000de4d1.tar.bz2
puppet-8a7f848c5d6bccc046ee763edc1d0cf0000de4d1.tar.xz
puppet-8a7f848c5d6bccc046ee763edc1d0cf0000de4d1.zip
change the From header of the mail alert, so this can be send on sysadmin-reports
-rw-r--r--modules/xymon/templates/hobbitserver.cfg3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/xymon/templates/hobbitserver.cfg b/modules/xymon/templates/hobbitserver.cfg
index df7bd086..22084388 100644
--- a/modules/xymon/templates/hobbitserver.cfg
+++ b/modules/xymon/templates/hobbitserver.cfg
@@ -94,7 +94,8 @@ BBHOSTHISTLOG="TRUE" # Save a log of all events for a host (not used by any t
SAVESTATUSLOG="TRUE" # Save the detailed status log each time the status changes.
# For the hobbitd_alert module
-MAILC="mail" # Command used to send an e-mail with no subject
+FROM="root@<%= domain %>"
+MAILC="mail -r $FROM" # Command used to send an e-mail with no subject
MAIL="$MAILC -s" # Command used to send an e-mail with a subject
SVCCODES="disk:100,cpu:200,procs:300,svcs:350,msgs:400,conn:500,http:600,dns:800,smtp:725,telnet:723,ftp:721,pop:810,pop3:810,pop-3:810,ssh:722,imap:843,ssh1:722,ssh2:722,imap2:843,imap3:843,imap4:843,pop2:809,pop-2:809,nntp:819,test:901"
ALERTCOLORS="red,yellow,purple" # Colors that may trigger an alert message