X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=694cebd660b99ce8db05677aa964cbcd449fcd60;hb=8913ee7cc9c54ba791e8fff0cd872a83f3cf6310;hp=cc17b30271d4ed65707f33bf27715c22469acb0b;hpb=f8d98ba06e273d21c21495625fb81d215ca3f46f;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index cc17b30..694cebd 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -243,6 +243,7 @@ services:
     hostgroups: computers
     excludehostgroups: syslog-ng-hosts
 
+ ### MAIL STUFF
  ###
   -
     name: process - exim
@@ -271,6 +272,21 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
+ ###
+  -
+    name: process - spamd - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
+    hosts: samosa
+  -
+    name: process - spamd - child
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -C spamd -a 'spamd child'"
+    hosts: samosa
+    depends: process - spamd - master
+ ###
+  -
+    name: process - greylistd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
+    hosts: samosa
 
  ###
   -
@@ -324,6 +340,8 @@ services:
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
+
+
  ###
   -
     name: process - uptimed
@@ -370,21 +388,6 @@ services:
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -g openldap -u openldap'"
     hosts: samosa
- ###
-  -
-    name: process - spamd - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: samosa
-  -
-    name: process - spamd - child
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -C spamd -a 'spamd child'"
-    hosts: samosa
-    depends: process - spamd - master
- ###
-  -
-    name: process - greylistd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
-    hosts: samosa
  ###
   -
     name: process - xinetd