# HG changeset patch
# User heiko
# Date 1198103396 0
# Node ID f52b403332873df8522d1a38d39981d57025c11d
# Parent  fa49cacf33d6749581c550d2732615a63c724e68
- new package name

diff -r fa49cacf33d6 -r f52b40333287 Makefile.in
--- a/Makefile.in	Wed Dec 19 22:02:31 2007 +0000
+++ b/Makefile.in	Wed Dec 19 22:29:56 2007 +0000
@@ -1,7 +1,7 @@
 # $Id$
 # $URL$
 
-SCRIPTS = check_exim
+SCRIPTS = check_exim check_smtp_conn
 CLEANFILES = ${SCRIPTS}
 DESTDIR =
 prefix  = !prefix!
@@ -25,4 +25,8 @@
 %:	%.pl
 	@perl -c $<
 	@cp -f $< $@
-	@chmod -+x $@
+	@chmod +x $@
+
+%:	%.sh
+	@cp -f $< $@
+	@chmod +x $@
diff -r fa49cacf33d6 -r f52b40333287 check_smtp_conn.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/check_smtp_conn.sh	Wed Dec 19 22:29:56 2007 +0000
@@ -0,0 +1,29 @@
+#! /bin/bash
+PATH=$PATH:/usr/sbin:/sbin:/usr/local/sbin
+EXIM=$(command -v exim4 || command -v exim)
+
+smtp_accept_max=$(set -- $($EXIM -bP smtp_accept_max); echo $3)
+warn=$((smtp_accept_max * 7 / 10))
+crit=$smtp_accept_max
+
+tmp=$(getopt -n $0 -o w:c: -- "$@")
+eval set -- $tmp
+
+while :
+do
+	opt="$1"; shift
+	case "$opt" in
+		-w)	warn="$1"; shift;;
+		-c)	crit="$1"; shift;;
+		--)	break;;
+	esac
+done
+
+r=$(($(exiwhat | wc -l) -1 ))
+p="connections=$r;$warn;$crit"
+
+
+test $r -gt $crit && { echo "CRIT ($r connections)|$p"; exit 2; }
+test $r -gt $warn && { echo "WARN ($r connections)|$p"; exit 1; }
+echo "OK ($r connections)|$p"
+exit 0
diff -r fa49cacf33d6 -r f52b40333287 debian/README
--- a/debian/README	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/README	Wed Dec 19 22:29:56 2007 +0000
@@ -1,4 +1,4 @@
-The Debian Package nagios-plugin-check-exim
+The Debian Package nagios-plugin-exim
 ----------------------------
 
 Comments regarding the Package
diff -r fa49cacf33d6 -r f52b40333287 debian/README.Debian
--- a/debian/README.Debian	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/README.Debian	Wed Dec 19 22:29:56 2007 +0000
@@ -1,4 +1,4 @@
-nagios-plugin-check-exim for Debian
+nagios-plugin-exim for Debian
 -----------------------------------
 
 <possible notes regarding this package - if none, delete this file>
diff -r fa49cacf33d6 -r f52b40333287 debian/changelog
--- a/debian/changelog	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/changelog	Wed Dec 19 22:29:56 2007 +0000
@@ -1,4 +1,10 @@
-nagios-plugin-check-exim (1.0) stable; urgency=low
+nagios-plugin-exim (1.1) stable; urgency=low
+
+  * added check_smtp_conn
+
+ -- Heiko Schlittermann <heiko@schlittermann.de>  Wed, 19 Dec 2007 23:28:35 +0100
+
+nagios-plugin-exim (1.0) stable; urgency=low
 
   * Initial Release.
 
diff -r fa49cacf33d6 -r f52b40333287 debian/control
--- a/debian/control	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/control	Wed Dec 19 22:29:56 2007 +0000
@@ -1,11 +1,11 @@
-Source: nagios-plugin-check-exim
+Source: nagios-plugin-exim
 Section: unknown
 Priority: extra
 Maintainer: Heiko Schlittermann <heiko@schlittermann.de>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 
-Package: nagios-plugin-check-exim
+Package: nagios-plugin-exim
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: nagios plugin to check exims workload / throughput
diff -r fa49cacf33d6 -r f52b40333287 debian/copyright
--- a/debian/copyright	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/copyright	Wed Dec 19 22:29:56 2007 +0000
@@ -1,4 +1,4 @@
-This is nagios-plugin-check-exim, written and maintained by Heiko Schlittermann <heiko@schlittermann.de>
+This is nagios-plugin-exim, written and maintained by Heiko Schlittermann <heiko@schlittermann.de>
 on Wed, 19 Dec 2007 22:28:35 +0100.
 
 The original source can always be found at:
diff -r fa49cacf33d6 -r f52b40333287 debian/cron.d.ex
--- a/debian/cron.d.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/cron.d.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -1,4 +1,4 @@
 #
-# Regular cron jobs for the nagios-plugin-check-exim package
+# Regular cron jobs for the nagios-plugin-exim package
 #
-0 4	* * *	root	nagios-plugin-check-exim_maintenance
+0 4	* * *	root	nagios-plugin-exim_maintenance
diff -r fa49cacf33d6 -r f52b40333287 debian/emacsen-install.ex
--- a/debian/emacsen-install.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/emacsen-install.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -1,12 +1,12 @@
 #! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/nagios-plugin-check-exim
+# /usr/lib/emacsen-common/packages/install/nagios-plugin-exim
 
 # Written by Jim Van Zandt <jrv@debian.org>, borrowing heavily
 # from the install scripts for gettext by Santiago Vila
 # <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
 
 FLAVOR=$1
-PACKAGE=nagios-plugin-check-exim
+PACKAGE=nagios-plugin-exim
 
 if [ ${FLAVOR} = emacs ]; then exit 0; fi
 
diff -r fa49cacf33d6 -r f52b40333287 debian/emacsen-remove.ex
--- a/debian/emacsen-remove.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/emacsen-remove.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -1,13 +1,13 @@
 #!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/nagios-plugin-check-exim
+# /usr/lib/emacsen-common/packages/remove/nagios-plugin-exim
 
 FLAVOR=$1
-PACKAGE=nagios-plugin-check-exim
+PACKAGE=nagios-plugin-exim
 
 if [ ${FLAVOR} != emacs ]; then
     if test -x /usr/sbin/install-info-altdir; then
         echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
-        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/nagios-plugin-check-exim.info.gz
+        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/nagios-plugin-exim.info.gz
     fi
 
     echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
diff -r fa49cacf33d6 -r f52b40333287 debian/emacsen-startup.ex
--- a/debian/emacsen-startup.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/emacsen-startup.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -1,25 +1,25 @@
 ;; -*-emacs-lisp-*-
 ;;
-;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50nagios-plugin-check-exim.el
-;; for the Debian nagios-plugin-check-exim package
+;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50nagios-plugin-exim.el
+;; for the Debian nagios-plugin-exim package
 ;;
 ;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
 ;; Modified by Dirk Eddelbuettel <edd@debian.org>
 ;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
 
-;; The nagios-plugin-check-exim package follows the Debian/GNU Linux 'emacsen' policy and
+;; The nagios-plugin-exim package follows the Debian/GNU Linux 'emacsen' policy and
 ;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
 ;; xemacs19, emacs20, xemacs20...).  The compiled code is then
 ;; installed in a subdirectory of the respective site-lisp directory.
 ;; We have to add this to the load-path:
 (let ((package-dir (concat "/usr/share/"
                            (symbol-name flavor)
-                           "/site-lisp/nagios-plugin-check-exim")))
-;; If package-dir does not exist, the nagios-plugin-check-exim package must have
+                           "/site-lisp/nagios-plugin-exim")))
+;; If package-dir does not exist, the nagios-plugin-exim package must have
 ;; removed but not purged, and we should skip the setup.
   (when (file-directory-p package-dir)
         (setq load-path (cons package-dir load-path))
-       (autoload 'nagios-plugin-check-exim-mode "nagios-plugin-check-exim-mode"
-         "Major mode for editing nagios-plugin-check-exim files." t)
-       (add-to-list 'auto-mode-alist '("\\.nagios-plugin-check-exim$" . nagios-plugin-check-exim-mode))))
+       (autoload 'nagios-plugin-exim-mode "nagios-plugin-exim-mode"
+         "Major mode for editing nagios-plugin-exim files." t)
+       (add-to-list 'auto-mode-alist '("\\.nagios-plugin-exim$" . nagios-plugin-exim-mode))))
 
diff -r fa49cacf33d6 -r f52b40333287 debian/init.d.ex
--- a/debian/init.d.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/init.d.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -11,15 +11,15 @@
 #
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/nagios-plugin-check-exim
-NAME=nagios-plugin-check-exim
-DESC=nagios-plugin-check-exim
+DAEMON=/usr/sbin/nagios-plugin-exim
+NAME=nagios-plugin-exim
+DESC=nagios-plugin-exim
 
 test -x $DAEMON || exit 0
 
-# Include nagios-plugin-check-exim defaults if available
-if [ -f /etc/default/nagios-plugin-check-exim ] ; then
-	. /etc/default/nagios-plugin-check-exim
+# Include nagios-plugin-exim defaults if available
+if [ -f /etc/default/nagios-plugin-exim ] ; then
+	. /etc/default/nagios-plugin-exim
 fi
 
 set -e
diff -r fa49cacf33d6 -r f52b40333287 debian/manpage.1.ex
--- a/debian/manpage.1.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/manpage.1.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -16,16 +16,16 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-nagios-plugin-check-exim \- program to do something
+nagios-plugin-exim \- program to do something
 .SH SYNOPSIS
-.B nagios-plugin-check-exim
+.B nagios-plugin-exim
 .RI [ options ] " files" ...
 .br
 .B bar
 .RI [ options ] " files" ...
 .SH DESCRIPTION
 This manual page documents briefly the
-.B nagios-plugin-check-exim
+.B nagios-plugin-exim
 and
 .B bar
 commands.
@@ -33,7 +33,7 @@
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBnagios-plugin-check-exim\fP is a program that...
+\fBnagios-plugin-exim\fP is a program that...
 .SH OPTIONS
 These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
@@ -53,7 +53,7 @@
 .IR "The Rise and Fall of a Fooish Bar" ,
 available via the Info system.
 .SH AUTHOR
-nagios-plugin-check-exim was written by <upstream author>.
+nagios-plugin-exim was written by <upstream author>.
 .PP
 This manual page was written by Heiko Schlittermann <heiko@schlittermann.de>,
 for the Debian project (but may be used by others).
diff -r fa49cacf33d6 -r f52b40333287 debian/manpage.sgml.ex
--- a/debian/manpage.sgml.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/manpage.sgml.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -27,7 +27,7 @@
   <!ENTITY dhemail     "<email>heiko@schlittermann.de</email>">
   <!ENTITY dhusername  "Heiko Schlittermann">
   <!ENTITY dhucpackage "<refentrytitle>NAGIOS-PLUGIN-CHECK-EXIM</refentrytitle>">
-  <!ENTITY dhpackage   "nagios-plugin-check-exim">
+  <!ENTITY dhpackage   "nagios-plugin-exim">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff -r fa49cacf33d6 -r f52b40333287 debian/manpage.xml.ex
--- a/debian/manpage.xml.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/manpage.xml.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -37,7 +37,7 @@
   <!ENTITY dhemail     "<email>heiko@schlittermann.de</email>">
   <!ENTITY dhusername  "Heiko Schlittermann">
   <!ENTITY dhucpackage "<refentrytitle>NAGIOS-PLUGIN-CHECK-EXIM</refentrytitle>">
-  <!ENTITY dhpackage   "nagios-plugin-check-exim">
+  <!ENTITY dhpackage   "nagios-plugin-exim">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff -r fa49cacf33d6 -r f52b40333287 debian/menu.ex
--- a/debian/menu.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/menu.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -1,2 +1,2 @@
-?package(nagios-plugin-check-exim):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\
-  title="nagios-plugin-check-exim" command="/usr/bin/nagios-plugin-check-exim"
+?package(nagios-plugin-exim):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\
+  title="nagios-plugin-exim" command="/usr/bin/nagios-plugin-exim"
diff -r fa49cacf33d6 -r f52b40333287 debian/nagios-plugin-check-exim-default.ex
--- a/debian/nagios-plugin-check-exim-default.ex	Wed Dec 19 22:02:31 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Defaults for nagios-plugin-check-exim initscript
-# sourced by /etc/init.d/nagios-plugin-check-exim
-# installed at /etc/default/nagios-plugin-check-exim by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""
diff -r fa49cacf33d6 -r f52b40333287 debian/nagios-plugin-check-exim.doc-base.EX
--- a/debian/nagios-plugin-check-exim.doc-base.EX	Wed Dec 19 22:02:31 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Document: nagios-plugin-check-exim
-Title: Debian nagios-plugin-check-exim Manual
-Author: <insert document author here>
-Abstract: This manual describes what nagios-plugin-check-exim is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/nagios-plugin-check-exim/nagios-plugin-check-exim.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/nagios-plugin-check-exim/nagios-plugin-check-exim.ps.gz
-
-Format: text
-Files: /usr/share/doc/nagios-plugin-check-exim/nagios-plugin-check-exim.text.gz
-
-Format: HTML
-Index: /usr/share/doc/nagios-plugin-check-exim/html/index.html
-Files: /usr/share/doc/nagios-plugin-check-exim/html/*.html
-
-  
diff -r fa49cacf33d6 -r f52b40333287 debian/nagios-plugin-exim-default.ex
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/nagios-plugin-exim-default.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -0,0 +1,10 @@
+# Defaults for nagios-plugin-exim initscript
+# sourced by /etc/init.d/nagios-plugin-exim
+# installed at /etc/default/nagios-plugin-exim by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""
diff -r fa49cacf33d6 -r f52b40333287 debian/nagios-plugin-exim.doc-base.EX
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/nagios-plugin-exim.doc-base.EX	Wed Dec 19 22:29:56 2007 +0000
@@ -0,0 +1,22 @@
+Document: nagios-plugin-exim
+Title: Debian nagios-plugin-exim Manual
+Author: <insert document author here>
+Abstract: This manual describes what nagios-plugin-exim is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/nagios-plugin-exim/nagios-plugin-exim.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/nagios-plugin-exim/nagios-plugin-exim.ps.gz
+
+Format: text
+Files: /usr/share/doc/nagios-plugin-exim/nagios-plugin-exim.text.gz
+
+Format: HTML
+Index: /usr/share/doc/nagios-plugin-exim/html/index.html
+Files: /usr/share/doc/nagios-plugin-exim/html/*.html
+
+  
diff -r fa49cacf33d6 -r f52b40333287 debian/postinst
--- a/debian/postinst	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/postinst	Wed Dec 19 22:29:56 2007 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for nagios-plugin-check-exim
+# postinst script for nagios-plugin-exim
 #
 # see: dh_installdeb(1)
 
diff -r fa49cacf33d6 -r f52b40333287 debian/postrm.ex
--- a/debian/postrm.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/postrm.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for nagios-plugin-check-exim
+# postrm script for nagios-plugin-exim
 #
 # see: dh_installdeb(1)
 
diff -r fa49cacf33d6 -r f52b40333287 debian/preinst.ex
--- a/debian/preinst.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/preinst.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# preinst script for nagios-plugin-check-exim
+# preinst script for nagios-plugin-exim
 #
 # see: dh_installdeb(1)
 
diff -r fa49cacf33d6 -r f52b40333287 debian/prerm
--- a/debian/prerm	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/prerm	Wed Dec 19 22:29:56 2007 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# prerm script for nagios-plugin-check-exim
+# prerm script for nagios-plugin-exim
 #
 # see: dh_installdeb(1)
 
diff -r fa49cacf33d6 -r f52b40333287 debian/rules
--- a/debian/rules	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/rules	Wed Dec 19 22:29:56 2007 +0000
@@ -35,7 +35,7 @@
 
 	# Add here commands to compile the package.
 	$(MAKE)
-	#docbook-to-man debian/nagios-plugin-check-exim.sgml > nagios-plugin-check-exim.1
+	#docbook-to-man debian/nagios-plugin-exim.sgml > nagios-plugin-exim.1
 
 	touch $@
 
@@ -55,8 +55,8 @@
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/nagios-plugin-check-exim.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/nagios-plugin-check-exim install
+	# Add here commands to install the package into debian/nagios-plugin-exim.
+	$(MAKE) DESTDIR=$(CURDIR)/debian/nagios-plugin-exim install
 
 
 # Build architecture-independent files here.
diff -r fa49cacf33d6 -r f52b40333287 debian/watch.ex
--- a/debian/watch.ex	Wed Dec 19 22:02:31 2007 +0000
+++ b/debian/watch.ex	Wed Dec 19 22:29:56 2007 +0000
@@ -8,15 +8,15 @@
 
 # Uncomment to examine a Webpage 
 # <Webpage URL> <string match>
-#http://www.example.com/downloads.php nagios-plugin-check-exim-(.*)\.tar\.gz
+#http://www.example.com/downloads.php nagios-plugin-exim-(.*)\.tar\.gz
 
 # Uncomment to examine a Webserver directory
-#http://www.example.com/pub/nagios-plugin-check-exim-(.*)\.tar\.gz
+#http://www.example.com/pub/nagios-plugin-exim-(.*)\.tar\.gz
 
 # Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/nagios-plugin-check-exim-(.*)\.tar\.gz debian uupdate
+#ftp://ftp.example.com/pub/nagios-plugin-exim-(.*)\.tar\.gz debian uupdate
 
 # Uncomment to find new files on sourceforge, for debscripts >= 2.9
-# http://sf.net/nagios-plugin-check-exim/nagios-plugin-check-exim-(.*)\.tar\.gz
+# http://sf.net/nagios-plugin-exim/nagios-plugin-exim-(.*)\.tar\.gz