[Pkg-nagios-changes] [pkg-nagios] r1858 - in nagios-plugins/trunk/debian: . pluginconfig

[Jan Wagner]

Author: waja
Date: 2010-03-11 12:28:02 +0000 (Thu, 11 Mar 2010)
New Revision: 1858

Added:
   nagios-plugins/trunk/debian/pluginconfig/mailq.cfg
Modified:
   nagios-plugins/trunk/debian/NEWS.Debian
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/control
   nagios-plugins/trunk/debian/pluginconfig/mail.cfg
   nagios-plugins/trunk/debian/rules
Log:
move check_mailq to nagios-plugins-standard

Modified: nagios-plugins/trunk/debian/NEWS.Debian
===================================================================
--- nagios-plugins/trunk/debian/NEWS.Debian	2010-03-10 09:37:25 UTC (rev 1857)
+++ nagios-plugins/trunk/debian/NEWS.Debian	2010-03-11 12:28:02 UTC (rev 1858)
@@ -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

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2010-03-10 09:37:25 UTC (rev 1857)
+++ nagios-plugins/trunk/debian/changelog	2010-03-11 12:28:02 UTC (rev 1858)
@@ -7,6 +7,10 @@
   * 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
 

Modified: nagios-plugins/trunk/debian/control
===================================================================
--- nagios-plugins/trunk/debian/control	2010-03-10 09:37:25 UTC (rev 1857)
+++ nagios-plugins/trunk/debian/control	2010-03-11 12:28:02 UTC (rev 1858)
@@ -61,7 +61,7 @@
 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:

Modified: nagios-plugins/trunk/debian/pluginconfig/mail.cfg
===================================================================
--- nagios-plugins/trunk/debian/pluginconfig/mail.cfg	2010-03-10 09:37:25 UTC (rev 1857)
+++ nagios-plugins/trunk/debian/pluginconfig/mail.cfg	2010-03-11 12:28:02 UTC (rev 1858)
@@ -36,30 +36,6 @@
 	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
 ####

Added: nagios-plugins/trunk/debian/pluginconfig/mailq.cfg
===================================================================
--- nagios-plugins/trunk/debian/pluginconfig/mailq.cfg	                        (rev 0)
+++ nagios-plugins/trunk/debian/pluginconfig/mailq.cfg	2010-03-11 12:28:02 UTC (rev 1858)
@@ -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
+}
+

Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules	2010-03-10 09:37:25 UTC (rev 1857)
+++ nagios-plugins/trunk/debian/rules	2010-03-11 12:28:02 UTC (rev 1858)
@@ -29,12 +29,13 @@
 	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