[project @ peter@palfrader.org-20081021135022-w6e9m0c6ow8cs343]

move exim heavy hosts from greylist to postgrey

diff --git a/nagios-master.cfg b/nagios-master.cfg
index c30868e..bd03b13 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -489,7 +489,7 @@ hostgroups:
     alias: hosts running postfix instead of exim
     private: 1
   heavy-exim:
     alias: hosts running postfix instead of exim
     private: 1
   heavy-exim:

-    alias: "hosts running the full mail stuff, including clamav, SA, and greylistd"
+    alias: "hosts running the full mail stuff, including clamav, SA, and postgrey"

     private: 1
   heavy-postfix:
     alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, policyd-weight"
     private: 1
   heavy-postfix:
     alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, policyd-weight"


@@ -1007,28 +1007,31 @@ services:
     hosts: merkel, raff
 
  ###
     hosts: merkel, raff
 
  ###

-  -
-    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'"
-    hostgroups: heavy-exim
+  #-
+  #  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'"
+  #  hostgroups: heavy-exim

   #
   -
     name: unwanted process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
     hostgroups: computers
   #
   -
     name: unwanted process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
     hostgroups: computers

-    excludehostgroups: heavy-exim

 
  ###
   -
     name: process - postgrey
 
  ###
   -
     name: process - postgrey

-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"

     hostgroups: heavy-postfix
     hostgroups: heavy-postfix

+  -
+    name: process - postgrey
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
+    hostgroups: heavy-exim

   #
   -
     name: unwanted process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
     hostgroups: computers
   #
   -
     name: unwanted process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
     hostgroups: computers

-    excludehostgroups: heavy-postfix
+    excludehostgroups: heavy-postfix, heavy-exim

  ###
   -
     name: process - amavis - master
  ###
   -
     name: process - amavis - master