[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-3-12-ga938089
Alexander Wirt
formorer at debian.org
Sat May 12 05:06:43 UTC 2012
The following commit has been merged in the master branch:
commit a9380890d338d91dbde30cc660d62e62c3a65309
Author: Alexander Wirt <formorer at debian.org>
Date: Sat May 12 07:06:12 2012 +0200
Remove not used conf.d from icinga.cfg
diff --git a/debian/patches/52_icinga.cfg-debianize.dpatch b/debian/patches/52_icinga.cfg-debianize.dpatch
index 7a5f33e..6c2186a 100755
--- a/debian/patches/52_icinga.cfg-debianize.dpatch
+++ b/debian/patches/52_icinga.cfg-debianize.dpatch
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-icinga~/sample-config/icinga.cfg.in pkg-icinga/sample-config/icinga.cfg.in
--- pkg-icinga~/sample-config/icinga.cfg.in 2012-05-11 22:33:54.000000000 +0200
-+++ pkg-icinga/sample-config/icinga.cfg.in 2012-05-12 07:01:19.264827790 +0200
-@@ -14,9 +14,19 @@
++++ pkg-icinga/sample-config/icinga.cfg.in 2012-05-12 07:06:05.568825059 +0200
+@@ -14,9 +14,14 @@
# for historical purposes. This should be the first option specified
# in the config file!!!
@@ -21,33 +21,53 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
+# Debian also defaults to using the check commands defined by the debian
+# nagios-plugins package
+cfg_dir=/etc/nagios-plugins/config
-+
-+# Debian uses by default a configuration directory where icinga-common,
-+# other packages and the local admin can dump or link configuration
-+# files into.
-+cfg_dir=/etc/icinga/objects/
# OBJECT CONFIGURATION FILE(S)
# These are the object configuration files in which you define hosts,
-@@ -40,13 +50,11 @@
- # this will include bar.cfg 2 times and lead to config verification errors.
-
- # You can specify individual object config files as shown below:
+@@ -24,38 +29,10 @@
+ # Hint: Check the docs/wiki on how to monitor remote hosts with different
+ # transport methods and plugins
+
+-# You can tell Icinga to process all config files (with a .cfg
+-# extension) in a particular directory recursively by using the
+-# cfg_dir directive as shown below with conf.d
+-
+-cfg_dir=@sysconfdir@/conf.d
+-
+-# or you can split your object definitions across several config files
+-# and include them one by one - see the provided sample config
+-# in objects/
+-#
+-# ATTENTION: do not mix cfg_file and cfg_dir such as
+-# cfg_file=foo/bar.cfg
+-# cfg_dir=foo
+-# this will include bar.cfg 2 times and lead to config verification errors.
+-
+-# You can specify individual object config files as shown below:
-cfg_file=@sysconfdir@/objects/commands.cfg
-cfg_file=@sysconfdir@/objects/contacts.cfg
-cfg_file=@sysconfdir@/objects/timeperiods.cfg
-cfg_file=@sysconfdir@/objects/templates.cfg
-
+-
-# Definitions for monitoring the local (Linux) host
-cfg_file=@sysconfdir@/objects/localhost.cfg
-+#cfg_file=@sysconfdir@/objects/commands.cfg
-+#cfg_file=@sysconfdir@/objects/contacts.cfg
-+#cfg_file=@sysconfdir@/objects/timeperiods.cfg
-+#cfg_file=@sysconfdir@/objects/templates.cfg
-
- # Definitions for monitoring a Windows machine
- #cfg_file=@sysconfdir@/objects/windows.cfg
-@@ -111,7 +119,7 @@
+-
+-# Definitions for monitoring a Windows machine
+-#cfg_file=@sysconfdir@/objects/windows.cfg
+-
+-# Definitions for monitoring a router/switch
+-#cfg_file=@sysconfdir@/objects/switch.cfg
+-
+-# Definitions for monitoring a network printer
+-#cfg_file=@sysconfdir@/objects/printer.cfg
++# Debian uses by default a configuration directory where icinga-common,
++# other packages and the local admin can dump or link configuration
++# files into.
++cfg_dir=/etc/icinga/objects/
+
+ # Definitions for ido2db process checks
+ #cfg_file=@sysconfdir@/objects/ido2db_check_proc.cfg
+@@ -111,7 +88,7 @@
# The contents of the status file are deleted every time Icinga
# restarts.
@@ -56,7 +76,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
-@@ -150,7 +158,7 @@
+@@ -150,7 +127,7 @@
# you will have to enable this.
# Values: 0 = disable commands, 1 = enable commands
@@ -65,7 +85,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
-@@ -179,8 +187,10 @@
+@@ -179,8 +156,10 @@
# is running as (usually 'nobody'). Permissions should be set at the
# directory level instead of on the file, as the file is deleted every
# time its contents are processed.
@@ -77,7 +97,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
-@@ -266,6 +276,11 @@
+@@ -266,6 +245,11 @@
# Example:
# broker_module=<modulepath> [moduleargs]
@@ -89,7 +109,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
#broker_module=@libdir@/idomod.so config_file=@sysconfdir@/idomod.cfg
-@@ -287,7 +302,7 @@
+@@ -287,7 +271,7 @@
# This is the directory where archived (rotated) log files should be
# placed (assuming you've chosen to do log rotation).
@@ -98,7 +118,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
-@@ -1211,7 +1226,7 @@
+@@ -1211,7 +1195,7 @@
# strict-iso8601 (YYYY-MM-DDTHH:MM:SS)
#
@@ -107,7 +127,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
-@@ -1241,7 +1256,7 @@
+@@ -1241,7 +1225,7 @@
# embedded Perl interpreter) is located. If you didn't compile
# Icinga with embedded Perl support, this option has no effect.
@@ -116,7 +136,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
-@@ -1255,7 +1270,7 @@
+@@ -1255,7 +1239,7 @@
# Only enable this setting when you really know what you are doing!
# Values: 0 = disable interpreter, 1 = enable interpreter
@@ -125,7 +145,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
-@@ -1350,8 +1365,8 @@
+@@ -1350,8 +1334,8 @@
# using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
# commands.
@@ -136,7 +156,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
-@@ -1392,7 +1407,7 @@
+@@ -1392,7 +1376,7 @@
# Values: 1 - Enable environment variable macros
# 0 - Disable environment variable macros (default)
@@ -145,7 +165,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
-@@ -1460,7 +1475,7 @@
+@@ -1460,7 +1444,7 @@
# DEBUG FILE
# This option determines where Icinga should write debugging information.
--
debian packaging of icinga(-core)
More information about the Pkg-nagios-changes
mailing list