[Pkg-nagios-devel] nagios/patches 07_fix_default_config.dpatch,1.3,1.4
seanius@haydn.debian.org
seanius@haydn.debian.org
Update of /cvsroot/pkg-nagios/nagios/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv31891/patches
Modified Files:
07_fix_default_config.dpatch
Log Message:
two more bugs squashed
Index: 07_fix_default_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/07_fix_default_config.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 07_fix_default_config.dpatch 17 Nov 2004 23:30:08 -0000 1.3
+++ 07_fix_default_config.dpatch 18 Jan 2005 07:17:09 -0000 1.4
@@ -7,9 +7,9 @@
## DP: sed in debian/rules to this dpatch.
@DPATCH@
-diff -urNad nagios-1.2/common/locations.h.in /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/common/locations.h.in
---- nagios-1.2/common/locations.h.in 2004-11-14 00:28:51.830054722 +0100
-+++ /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/common/locations.h.in 2004-11-14 00:28:52.360975906 +0100
+diff -urNad nagios-1.3-cvs.20050116/common/locations.h.in /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/common/locations.h.in
+--- nagios-1.3-cvs.20050116/common/locations.h.in 2005-01-16 20:08:23.000000000 -0500
++++ /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/common/locations.h.in 2005-01-18 01:57:14.000000000 -0500
@@ -19,14 +19,14 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
************************************************************************/
@@ -28,10 +28,10 @@
#define DEFAULT_PHYSICAL_HTML_PATH "@datadir@"
#define DEFAULT_URL_HTML_PATH "@htmurl@"
#define DEFAULT_PHYSICAL_CGIBIN_PATH "@sbindir@"
-diff -urNad nagios-1.2/sample-config/cgi.cfg.in /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/sample-config/cgi.cfg.in
---- nagios-1.2/sample-config/cgi.cfg.in 2004-11-14 00:28:52.101014498 +0100
-+++ /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/sample-config/cgi.cfg.in 2004-11-14 00:28:52.361975758 +0100
-@@ -119,7 +123,7 @@
+diff -urNad nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in
+--- nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in 2005-01-18 01:57:13.000000000 -0500
++++ /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in 2005-01-18 02:04:07.000000000 -0500
+@@ -125,7 +125,7 @@
# not use authorization. You may use an asterisk (*) to
# authorize any user who has authenticated to the web server.
@@ -40,7 +40,7 @@
-@@ -131,7 +135,7 @@
+@@ -137,7 +137,7 @@
# an asterisk (*) to authorize any user who has authenticated
# to the web server.
@@ -49,7 +49,7 @@
-@@ -144,7 +148,7 @@
+@@ -150,7 +150,7 @@
# You may use an asterisk (*) to authorize any user who has
# authenticated to the web server.
@@ -58,7 +58,7 @@
-@@ -157,8 +161,8 @@
+@@ -163,8 +163,8 @@
# to authorize any user who has authenticated to the web server.
@@ -69,7 +69,7 @@
-@@ -171,8 +175,8 @@
+@@ -177,8 +177,8 @@
# authorization). You may use an asterisk (*) to authorize any
# user who has authenticated to the web server.
@@ -80,9 +80,112 @@
-diff -urNad nagios-1.2/sample-config/nagios.cfg.in /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/sample-config/nagios.cfg.in
---- nagios-1.2/sample-config/nagios.cfg.in 2004-11-14 00:28:51.831054574 +0100
-+++ /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/sample-config/nagios.cfg.in 2004-11-14 00:29:29.529457687 +0100
+@@ -190,57 +190,12 @@
+ # statuswrl CGIs. You can also specify an URL that links to a document
+ # containing more information about the host (location details, contact
+ # information, etc).
+-#
+-# hostextinfo[<host_name>]=<notes_url>;<icon_image>;<vrml_image>;<gd2_image>;\
+-# <image_alt>;<x_2d>,<y_2d>;<x_3d>,<y_3d>,<z_3d>;
+-#
+-# <notes_url> = Optional URL that points to a document of
+-# some type containing information on the host.
+-# The information (and the document type) can
+-# be anything you want. Examples include details
+-# on the physical location of the server, info
+-# on how to contact the admins in case of an
+-# emergency, etc. Relative URLs start in the
+-# same path that is used to access the CGIs.
+-# The link that is created for the host's notes
+-# notes is found in the extinfo CGI.
+-# Note: You may use the $HOSTNAME$ and
+-# $HOSTADDRESS$ macros in this URL.
+-# <icon_image> = A GIF, PNG, or JPEG image to associate with
+-# the host. This is used in the status and
+-# extinfo CGIs.
+-# <vrml_image> = An image to use in the statuswrl CGI in the
+-# VRML generation. Transparent images don't
+-# work so great..
+-# <gd2_image> = An image used by the statusmap CGI to
+-# represent the host. This can be a GIF, PNG,
+-# JPEG, or GD2 image. GD2 format is recommended,
+-# as it produces the load CPU load.
+-# utility supplied with Boutell's gd library.
+-# <image_alt> = ALT tag used with images in various CGIs
+-# <x_2d>,<y_2d> = X and Y coordinates used when drawing the
+-# host in the statusmap CGI. (0,0) is located
+-# in the upper left corner of the screen and is
+-# considered to be the origin. The coordinates
+-# you supply here are used as the coords of the
+-# upper left hand corner of host icon. Both
+-# numbers should be positive integers.
+-# <x_3d>,<y_3d>,<z_3d> = X, Y, and Z coordinates used when drawing
+-# the host in the statuswrl (VRML) CGI. All
+-# numbers can be positive or negative (anywhere
+-# in 3-D space). The coordinates are used to
+-# determine the center of the host "cube" that
+-# is drawn. Host "cubes" are drawn with a
+-# height, width, and depth of 0.5 (meters).
+-#
+-# Note: All images must be placed in the /logos subdirectory under
+-# the HTML images path (i.e. /usr/local/nagios/share/images/logos/).
+-# This path is automatically determined by appending "/images/logos"
+-# to the path specified by the 'physical_html_path' directive.
+-
+-#hostextinfo[es-eds]=/serverinfo/es-eds.html;novell40.gif;novell40.jpg;novell40.gd2;IntranetWare 4.11;100,50;3.5,0.0,-1.5;
+-#hostextinfo[rosie]=/serverinfo/rosie.html;win40.gif;win40.jpg;win40.gd2;NT Server 4.0;;;
+
++# nagios-text users: you must use the "template" based host extinfo,
++# as described in the online documentation.
++# nagios-mysql and nagios-pgsql: this information is stored in your
++# nagios database. see also the database settings at the bottom
++# of this file as well
+
+
+ # EXTENDED SERVICE INFORMATION
+@@ -250,34 +205,12 @@
+ # You can also specify an URL that links to a document containing more
+ # information about the service (location details, contact information,
+ # etc).
+-#
+-# serviceextinfo[<host_name>;<svc_description>]=<notes_url>;<icon_image>;<image_alt>
+-#
+-# <notes_url> = Optional URL that points to a document of
+-# some type containing information on the service.
+-# The information (and the document type) can
+-# be anything you want. Examples include details
+-# on the physical location of the server, info
+-# on how to contact the admins in case of an
+-# emergency, etc. Relative URLs start in the
+-# same path that is used to access the CGIs.
+-# The link that is created for the service's
+-# notes URL is found in the extinfo CGI.
+-# Note: You may use the $HOSTNAME$, $HOSTADDRESS$,
+-# and $SERVICEDESC$ macros in this URL.
+-# <icon_image> = A GIF, PNG, or JPEG image to associate with
+-# the service. This is used in the status and
+-# extinfo CGIs.
+-# <image_alt> = ALT tag used with image
+-#
+-# Note: All images must be placed in the /logos subdirectory under
+-# the HTML images path (i.e. /usr/local/nagios/share/images/logos/).
+-# This path is automatically determined by appending "/images/logos"
+-# to the path specified by the 'physical_html_path' directive.
+-
+-#serviceextinfo[es-eds;PING]=http://www.somewhere.com?tracerouteto=$HOSTADDRESS$;;PING rate
+-#serviceextinfo[rosie;Security Alerts]=;security.gif;Security alerts
+
++# nagios-text users: you must use the "template" based service extinfo,
++# as described in the online documentation.
++# nagios-mysql and nagios-pgsql: this information is stored in your
++# nagios database. see also the database settings at the bottom
++# of this file as well
+
+
+ # STATUSMAP BACKGROUND IMAGE
+diff -urNad nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in
+--- nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in 2005-01-16 20:08:23.000000000 -0500
++++ /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in 2005-01-18 01:57:14.000000000 -0500
@@ -36,6 +36,14 @@
# plugin release rather than the one provided with Nagios.
cfg_file=@sysconfdir@/checkcommands.cfg