wrong macros in sample config

found by sebastian schuetz
This commit is contained in:
sturm 2005-10-10 18:42:24 +00:00
parent 357a58db8d
commit 63854d34db
2 changed files with 23 additions and 2 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2005/09/22 15:08:32 sturm Exp $
# $OpenBSD: Makefile,v 1.6 2005/10/10 18:42:24 sturm Exp $
COMMENT= "host and service monitor"
COMMENT-web= "cgis and webpages for nagios"
V= 2.0b4
DISTNAME= nagios-${V}
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
PKGNAME-web= nagios-web-${V}
CATEGORIES= net

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-sample-config_template-object_minimal_cfg_in,v 1.1 2005/10/10 18:42:24 sturm Exp $
--- sample-config/template-object/minimal.cfg.in.orig Wed Mar 23 23:07:12 2005
+++ sample-config/template-object/minimal.cfg.in Mon Oct 10 20:37:31 2005
@@ -58,7 +58,7 @@ define timeperiod{
define command{
command_name notify-by-email
- command_line /usr/bin/printf "%b" "***** Nagios @VERSION@ *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$OUTPUT$" | @MAIL_PROG@ -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
+ command_line /usr/bin/printf "%b" "***** Nagios @VERSION@ *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | @MAIL_PROG@ -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
}
@@ -67,7 +67,7 @@ define command{
define command{
command_name host-notify-by-email
- command_line /usr/bin/printf "%b" "***** Nagios @VERSION@ *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | @MAIL_PROG@ -s "Host $HOSTSTATE$ alert for $HOSTNAME$!" $CONTACTEMAIL$
+ command_line /usr/bin/printf "%b" "***** Nagios @VERSION@ *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | @MAIL_PROG@ -s "Host $HOSTSTATE$ alert for $HOSTNAME$!" $CONTACTEMAIL$
}