[project @ peter@palfrader.org-20080428221116-suyhvbp8nnyal5ja]

raptor now has mail

diff --git a/checkcommands.cfg b/checkcommands.cfg
index 9203225..88cf91f 100644 (file)
--- a/checkcommands.cfg
+++ b/checkcommands.cfg
@@ -8,6 +8,10 @@ define command {
        command_name    dsa_check_nrpe
        command_line    /usr/lib/nagios/plugins/check_nrpe --no-ssl -H $HOSTADDRESS$ -t 50 -c $ARG1$
 }
+define command {
+       command_name    dsa_check_nrpe_host
+       command_line    /usr/lib/nagios/plugins/check_nrpe --no-ssl -H $ARG1$ -c $ARG2$
+}
 define command{
        command_name    dsa_check_cert
        command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p $ARG1$ -S -C 14

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 92c049a..42f76f1 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -290,7 +290,7 @@ servers:
   raptor:
     address: 195.243.109.162
     parents: gw-topalis
-    hostgroups: computers, porterbox
+    hostgroups: computers, porterbox, postfix-hosts
 
   albeniz:
     address: 193.62.202.27
@@ -977,13 +977,19 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, kassia, allegri
+    excludehosts: verdi, kassia, allegri, raptor
     depends: process - postfix - master
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
     hosts: verdi, kassia, murphy, allegri
     depends: process - postfix - master
+  -
+    name: network service - smtp - port 2025
+    remotecheck: /usr/lib/nagios/plugins/check_smtp -t 40 -H $HOSTADDRESS$ -p 2025
+    runfrom: murphy
+    hosts: raptor
+    depends: process - postfix - master
 
   -
     name: network service local - smtps cert