[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-3-9-g2ebdf35
Alexander Wirt
formorer at debian.org
Sat May 12 04:51:51 UTC 2012
The following commit has been merged in the master branch:
commit 57b5f42693e25c74e17b73bf2db1ba2fa13d42db
Author: Alexander Wirt <formorer at debian.org>
Date: Fri May 11 22:49:48 2012 +0200
Remove .rej from patch
diff --git a/debian/patches/51_commands.cfg-debianize.dpatch b/debian/patches/51_commands.cfg-debianize.dpatch
index 457e055..5182f5f 100755
--- a/debian/patches/51_commands.cfg-debianize.dpatch
+++ b/debian/patches/51_commands.cfg-debianize.dpatch
@@ -236,208 +236,4 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
################################################################################
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-icinga~/sample-config/template-object/commands.cfg.in.rej pkg-icinga/sample-config/template-object/commands.cfg.in.rej
---- pkg-icinga~/sample-config/template-object/commands.cfg.in.rej 1970-01-01 01:00:00.000000000 +0100
-+++ pkg-icinga/sample-config/template-object/commands.cfg.in.rej 2011-11-26 09:16:02.475713580 +0100
-@@ -0,0 +1,201 @@
-+--- sample-config/template-object/commands.cfg.in 2011-08-25 08:47:20.000000000 +0200
-++++ sample-config/template-object/commands.cfg.in 2011-08-25 09:55:15.000000000 +0200
-+@@ -30,197 +25,8 @@
-+ }
-+
-+
-+-
-+-
-+-
-+-################################################################################
-+-#
-+-# SAMPLE HOST CHECK COMMANDS
-+-#
-+-################################################################################
-+-
-+-
-+-# This command checks to see if a host is "alive" by pinging it
-+-# The check must result in a 100% packet loss or 5 second (5000ms) round trip
-+-# average time to produce a critical error.
-+-# Note: Five ICMP echo packets are sent (determined by the '-p 5' argument)
-+-
-+-# 'check-host-alive' command definition
-+-define command{
-+- command_name check-host-alive
-+- command_line $USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5
-+- }
-+-
-+-
-+-
-+-
-+-################################################################################
-+-#
-+-# SAMPLE SERVICE CHECK COMMANDS
-+-#
-+-# These are some example service check commands. They may or may not work on
-+-# your system, as they must be modified for your plugins. See the HTML
-+-# documentation on the plugins for examples of how to configure command definitions.
-+-#
-+-# NOTE: The following 'check_local_...' functions are designed to monitor
-+-# various metrics on the host that Icinga is running on (i.e. this one).
-+-################################################################################
-+-
-+-# 'check_local_disk' command definition
-+-define command{
-+- command_name check_local_disk
-+- command_line $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
-+- }
-+-
-+-
-+-# 'check_local_load' command definition
-+-define command{
-+- command_name check_local_load
-+- command_line $USER1$/check_load -w $ARG1$ -c $ARG2$
-+- }
-+-
-+-
-+-# 'check_local_procs' command definition
-+-define command{
-+- command_name check_local_procs
-+- command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
-+- }
-+-
-+-
-+-# 'check_local_users' command definition
-+-define command{
-+- command_name check_local_users
-+- command_line $USER1$/check_users -w $ARG1$ -c $ARG2$
-+- }
-+-
-+-
-+-# 'check_local_swap' command definition
-+-define command{
-+- command_name check_local_swap
-+- command_line $USER1$/check_swap -w $ARG1$ -c $ARG2$
-+- }
-+-
-+-
-+-# 'check_local_mrtgtraf' command definition
-+-define command{
-+- command_name check_local_mrtgtraf
-+- command_line $USER1$/check_mrtgtraf -F $ARG1$ -a $ARG2$ -w $ARG3$ -c $ARG4$ -e $ARG5$
-+- }
-+-
-+-
-+-################################################################################
-+-# NOTE: The following 'check_...' commands are used to monitor services on
-+-# both local and remote hosts.
-+-################################################################################
-+-
-+-# 'check_ftp' command definition
-+-define command{
-+- command_name check_ftp
-+- command_line $USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$
-+- }
-+-
-+-
-+-# 'check_hpjd' command definition
-+-define command{
-+- command_name check_hpjd
-+- command_line $USER1$/check_hpjd -H $HOSTADDRESS$ $ARG1$
-+- }
-+-
-+-
-+-# 'check_snmp' command definition
-+-define command{
-+- command_name check_snmp
-+- command_line $USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$
-+- }
-+-
-+-
-+-# 'check_http' command definition
-+-define command{
-+- command_name check_http
-+- command_line $USER1$/check_http -I $HOSTADDRESS$ $ARG1$
-+- }
-+-
-+-
-+-# 'check_ssh' command definition
-+-define command{
-+- command_name check_ssh
-+- command_line $USER1$/check_ssh $ARG1$ $HOSTADDRESS$
-+- }
-+-
-+-
-+-# 'check_dhcp' command definition
-+-define command{
-+- command_name check_dhcp
-+- command_line $USER1$/check_dhcp $ARG1$
-+- }
-+-
-+-
-+-# 'check_ping' command definition
-+-define command{
-+- command_name check_ping
-+- command_line $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5
-+- }
-+-
-+-
-+-# 'check_pop' command definition
-+-define command{
-+- command_name check_pop
-+- command_line $USER1$/check_pop -H $HOSTADDRESS$ $ARG1$
-+- }
-+-
-+-
-+-# 'check_imap' command definition
-+-define command{
-+- command_name check_imap
-+- command_line $USER1$/check_imap -H $HOSTADDRESS$ $ARG1$
-+- }
-+-
-+-
-+-# 'check_smtp' command definition
-+-define command{
-+- command_name check_smtp
-+- command_line $USER1$/check_smtp -H $HOSTADDRESS$ $ARG1$
-+- }
-+-
-+-
-+-# 'check_tcp' command definition
-+-define command{
-+- command_name check_tcp
-+- command_line $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
-+- }
-+-
-+-
-+-# 'check_udp' command definition
-+-define command{
-+- command_name check_udp
-+- command_line $USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
-+- }
-+-
-+-
-+-# 'check_nt' command definition
-+-define command{
-+- command_name check_nt
-+- command_line $USER1$/check_nt -H $HOSTADDRESS$ -p 12489 -v $ARG1$ $ARG2$
-+- }
-+-
-+-
-+-# 'check_dummy' command definition
-+-define command{
-+- command_name check_dummy
-+- command_line $USER1$/check_dummy $ARG1$
-+- }
-+-
-+-
-+-
-+ ################################################################################
-+-#
-+-# SAMPLE PERFORMANCE DATA COMMANDS
-+-#
-+-# These are sample performance data commands that can be used to send performance
-+-# data output to two text files (one for hosts, another for services). If you
-+-# plan on simply writing performance data out to a file, consider using the
-+-# host_perfdata_file and service_perfdata_file options in the main config file.
-+-#
-++# PERFORMANCE DATA COMMANDS
-+ ################################################################################
-+
-+
+
--
debian packaging of icinga(-core)
More information about the Pkg-nagios-changes
mailing list