SVN: nagios-notify/trunk: nagios-notify.cfg templates/host-notify-by-eggdrop.tmpl templates/host-not...

[glen]

Author: glen
Date: Tue Nov  4 00:06:17 2008
New Revision: 9949

Added:
   nagios-notify/trunk/templates/notify-host-by-eggdrop.tmpl   (props changed)
      - copied unchanged from rev 9902, nagios-notify/trunk/templates/host-notify-by-eggdrop.tmpl
   nagios-notify/trunk/templates/notify-host-by-email.tmpl   (props changed)
      - copied unchanged from rev 9902, nagios-notify/trunk/templates/host-notify-by-email.tmpl
   nagios-notify/trunk/templates/notify-host-by-jabber.tmpl   (props changed)
      - copied unchanged from rev 9902, nagios-notify/trunk/templates/host-notify-by-jabber.tmpl
   nagios-notify/trunk/templates/notify-host-by-sms.tmpl   (props changed)
      - copied unchanged from rev 9902, nagios-notify/trunk/templates/host-notify-by-sms.tmpl
   nagios-notify/trunk/templates/notify-service-by-eggdrop.tmpl   (props changed)
      - copied unchanged from rev 9902, nagios-notify/trunk/templates/notify-by-eggdrop.tmpl
   nagios-notify/trunk/templates/notify-service-by-email-conditions.tmpl   (props changed)
      - copied unchanged from rev 9905, nagios-notify/trunk/templates/notify-by-email-conditions.tmpl
   nagios-notify/trunk/templates/notify-service-by-email.tmpl   (props changed)
      - copied unchanged from rev 9902, nagios-notify/trunk/templates/notify-by-email.tmpl
   nagios-notify/trunk/templates/notify-service-by-jabber-embedimage.tmpl   (props changed)
      - copied unchanged from rev 9902, nagios-notify/trunk/templates/notify-by-jabber-embedimage.tmpl
   nagios-notify/trunk/templates/notify-service-by-jabber-richtext.tmpl   (props changed)
      - copied unchanged from rev 9931, nagios-notify/trunk/templates/notify-by-jabber-richtext.tmpl
   nagios-notify/trunk/templates/notify-service-by-sms.tmpl   (props changed)
      - copied unchanged from rev 9902, nagios-notify/trunk/templates/notify-by-sms.tmpl
Removed:
   nagios-notify/trunk/templates/host-notify-by-eggdrop.tmpl
   nagios-notify/trunk/templates/host-notify-by-email.tmpl
   nagios-notify/trunk/templates/host-notify-by-jabber.tmpl
   nagios-notify/trunk/templates/host-notify-by-sms.tmpl
   nagios-notify/trunk/templates/notify-by-eggdrop.tmpl
   nagios-notify/trunk/templates/notify-by-email-conditions.tmpl
   nagios-notify/trunk/templates/notify-by-email.tmpl
   nagios-notify/trunk/templates/notify-by-jabber-embedimage.tmpl
   nagios-notify/trunk/templates/notify-by-jabber-richtext.tmpl
   nagios-notify/trunk/templates/notify-by-sms.tmpl
Modified:
   nagios-notify/trunk/nagios-notify.cfg
Log:
- sanitize naming of host/templates: 
s/host-notify-by-/notify-host-by-/
s/notify-by-/notify-service-by-/



Modified: nagios-notify/trunk/nagios-notify.cfg
==============================================================================
--- nagios-notify/trunk/nagios-notify.cfg	(original)
+++ nagios-notify/trunk/nagios-notify.cfg	Tue Nov  4 00:06:17 2008
@@ -11,40 +11,40 @@
 
 # notify by email
 define command {
-	command_name	notify-by-email
-	command_line	/usr/lib/nagios/nagios-notify notify-by-email | /usr/lib/sendmail -oi -t
+	command_name	notify-service-by-email
+	command_line	/usr/lib/nagios/nagios-notify notify-service-by-email | /usr/lib/sendmail -oi -t
 }
 define command {
-	command_name	host-notify-by-email
-	command_line	/usr/lib/nagios/nagios-notify host-notify-by-email | /usr/lib/sendmail -oi -t
+	command_name	notify-host-by-email
+	command_line	/usr/lib/nagios/nagios-notify notify-host-by-email | /usr/lib/sendmail -oi -t
 }
 
 # notify by sms
 define command {
-	command_name	host-notify-by-sms
-	command_line	/usr/lib/nagios/nagios-notify host-notify-by-sms | /usr/lib/sendmail -oi -t
+	command_name	notify-host-by-sms
+	command_line	/usr/lib/nagios/nagios-notify notify-host-by-sms | /usr/lib/sendmail -oi -t
 }
 define command {
-	command_name	notify-by-sms
-	command_line	/usr/lib/nagios/nagios-notify notify-by-sms | /usr/lib/sendmail -oi -t
+	command_name	notify-service-by-sms
+	command_line	/usr/lib/nagios/nagios-notify notify-service-by-sms | /usr/lib/sendmail -oi -t
 }
 
 # notify by jabber
 define command {
-	command_name	host-notify-by-jabber
-	command_line	/usr/lib/nagios/nagios-notify host-notify-by-jabber | /usr/sbin/nagios-notify-jabber -a $USER6$ $CONTACTADDRESS1$
+	command_name	notify-host-by-jabber
+	command_line	/usr/lib/nagios/nagios-notify notify-host-by-jabber | /usr/sbin/nagios-notify-jabber -a $USER6$ $CONTACTADDRESS1$
 }
 define command {
-	command_name	notify-by-jabber
-	command_line	/usr/lib/nagios/nagios-notify notify-by-jabber | /usr/sbin/nagios-notify-jabber -a $USER6$ $CONTACTADDRESS1$
+	command_name	notify-service-by-jabber
+	command_line	/usr/lib/nagios/nagios-notify notify-service-by-jabber | /usr/sbin/nagios-notify-jabber -a $USER6$ $CONTACTADDRESS1$
 }
 
 # notify by eggdrop
 define command {
-	command_name	host-notify-by-eggdrop
-	command_line	/usr/lib/nagios/nagios-notify host-notify-by-eggdrop | /usr/bin/t0xirc -u $USER8$ -p $USER9$ -h localhost -P 3333 -c '$CONTACTPAGER$'
+	command_name	notify-host-by-eggdrop
+	command_line	/usr/lib/nagios/nagios-notify notify-host-by-eggdrop | /usr/bin/t0xirc -u $USER8$ -p $USER9$ -h localhost -P 3333 -c '$CONTACTPAGER$'
 }
 define command {
-	command_name	notify-by-eggdrop
-	command_line	/usr/lib/nagios/nagios-notify notify-by-eggdrop | /usr/bin/t0xirc -u $USER8$ -p $USER9$ -h localhost -P 3333 -c '$CONTACTPAGER$'
+	command_name	notify-service-by-eggdrop
+	command_line	/usr/lib/nagios/nagios-notify notify-service-by-eggdrop | /usr/bin/t0xirc -u $USER8$ -p $USER9$ -h localhost -P 3333 -c '$CONTACTPAGER$'
 }