[Pkg-nagios-changes] [pkg-nagios-plugins] 217/413: move check_mailq to nagios-plugins-standard

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit 3b24d30feed91b98acb1072e1627e12135a3ec7a
Author: Jan Wagner <waja at cyconet.org>
Date:   Thu Mar 11 12:28:02 2010 +0000

    move check_mailq to nagios-plugins-standard
---
 debian/NEWS.Debian            |  8 ++++++++
 debian/changelog              |  4 ++++
 debian/control                |  2 +-
 debian/pluginconfig/mail.cfg  | 24 ------------------------
 debian/pluginconfig/mailq.cfg | 24 ++++++++++++++++++++++++
 debian/rules                  |  3 ++-
 6 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index 4ee7764..e9665c1 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,3 +1,11 @@
+nagios-plugins (1.4.14-2) unstable; urgency=low
+
+  Moved check_mailq to nagios-plugins-standard, because it requires the mailq
+  binary and it is shipped with postfix, exim, sendmail and qmail, which is
+  the plugin is intended to check.
+
+ -- Jan Wagner <waja at cyconet.org>  Thu, 11 Mar 2010 13:24:23 +0100
+
 nagios-plugins (1.4.14-1) unstable; urgency=low
 
   If your are using check_linux_raid.pl or check_bgpstate (respectively the
diff --git a/debian/changelog b/debian/changelog
index 3e8adb4..7e5693f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ nagios-plugins (1.4.14-2) UNRELEASED; urgency=low
   * Add 43_check_http_large_pages_mleak.dpatch, taken from upstream, which
     fixes memory leaks on large files
   * Add trailing trunk/ at Vcs-Svn-field
+  * Move check_mailq to nagios-plugins-standard, cause it depends
+    postfix|sendmail|exim4 or qmail
+    - Add "postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light" to
+      Suggests of nagios-plugins-standard
 
  -- Jan Wagner <waja at cyconet.org>  Wed, 03 Mar 2010 08:13:31 +0100
 
diff --git a/debian/control b/debian/control
index 0ae5da1..57d73f3 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,7 @@ Conflicts: nagios-plugins (<= 1.4.2-3)
 Replaces: nagios-plugins
 Depends: ${shlibs:Depends}, ${misc:Depends}, fping, snmp, radiusclient1, libnet-snmp-perl, dnsutils, bind9-host | host, smbclient, ucf, nagios-plugins-basic (>= 1.4.5-2)
 Recommends: qstat
-Suggests: nagios3, whois
+Suggests: nagios3, postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light, whois 
 Description: Plugins for the nagios network monitoring and management system
  Nagios is a host/service/network monitoring and management system. It has
  the following features:
diff --git a/debian/pluginconfig/mail.cfg b/debian/pluginconfig/mail.cfg
index c332c20..b9739f2 100644
--- a/debian/pluginconfig/mail.cfg
+++ b/debian/pluginconfig/mail.cfg
@@ -36,30 +36,6 @@ define command {
 	command_line	/usr/lib/nagios/plugins/check_imap -p 993 -H '$HOSTADDRESS$' -S
 }
 
-# 'check-mailq' for sendmail
-define command {
-        command_name    check_mailq_sendmail
-	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M sendmail
-}
-
-# 'check-mailq' for postfix
-define command {
-        command_name    check_mailq_postfix
-	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M postfix
-}
-
-# 'check-mailq' for exim
-define command {
-        command_name    check_mailq_exim
-	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M exim
-}
-
-# 'check-mailq' for qmail
-define command {
-        command_name    check_mailq_qmail
-	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M qmail
-}
-
 ####
 # use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems
 ####
diff --git a/debian/pluginconfig/mailq.cfg b/debian/pluginconfig/mailq.cfg
new file mode 100644
index 0000000..9fb4486
--- /dev/null
+++ b/debian/pluginconfig/mailq.cfg
@@ -0,0 +1,24 @@
+# 'check-mailq' for sendmail
+define command {
+        command_name    check_mailq_sendmail
+	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M sendmail
+}
+
+# 'check-mailq' for postfix
+define command {
+        command_name    check_mailq_postfix
+	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M postfix
+}
+
+# 'check-mailq' for exim
+define command {
+        command_name    check_mailq_exim
+	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M exim
+}
+
+# 'check-mailq' for qmail
+define command {
+        command_name    check_mailq_qmail
+	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M qmail
+}
+
diff --git a/debian/rules b/debian/rules
index 552675d..0739f82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,12 +29,13 @@ std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
 	check_rpc check_snmp check_wave check_fping check_game \
 	check_radius check_mysql check_mysql_query check_pgsql \
 	check_disk_smb check_ldap check_ldaps \
+	check_mailq \
 	check_dns check_dig check_flexlm check_oracle
 
 basic_plugin_cfgs:=apt dhcp disk dummy ftp http load mail news ntp ping procs \
 	real ssh tcp_udp telnet users
 std_plugin_cfgs:=breeze disk-smb dns flexlm fping games hppjd ifstatus ldap \
-	mrtg mysql netware nt pgsql radius rpc-nfs snmp
+	mailq mrtg mysql netware nt pgsql radius rpc-nfs snmp
 
 PATH = /bin:/sbin:/usr/bin:/usr/sbin
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git