[Pkg-nagios-devel] Bug#291775: marked as done (nagios-common: Add
"grouplist" patch from internet to simplify working with many
hostgroups)
Debian Bug Tracking System
owner at bugs.debian.org
Thu Aug 4 00:18:08 UTC 2005
Your message dated Wed, 3 Aug 2005 20:15:27 -0400
with message-id <20050804001527.GA17544 at seanius.net>
and subject line closing old bug
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 23 Jan 2005 02:13:54 +0000
>From filip.sneppe at cronos.be Sat Jan 22 18:13:54 2005
Return-path: <filip.sneppe at cronos.be>
Received: from amsfep14-int.chello.nl [213.46.243.21]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1CsXGD-0001Vv-00; Sat, 22 Jan 2005 18:13:53 -0800
Received: from [192.168.1.99] (really [213.132.143.80])
by amsfep14-int.chello.nl
(InterMail vM.6.01.03.04 201-2131-111-106-20040729) with ESMTP
id <20050123021319.RMPY1537.amsfep14-int.chello.nl@[192.168.1.99]>;
Sun, 23 Jan 2005 03:13:19 +0100
Content-Type: multipart/mixed; boundary="===============1159670625=="
MIME-Version: 1.0
From: Filip Sneppe <filip.sneppe at cronos.be>
To: Debian Bug Tracking System <submit at bugs.debian.org>
Subject: nagios-common: Add "grouplist" patch from internet to simplify working with
many hostgroups
Bcc: Filip Sneppe <filip.sneppe at cronos.be>
X-Mailer: reportbug 3.2
Date: Sun, 23 Jan 2005 03:13:18 +0100
Message-Id: <20050123021319.RMPY1537.amsfep14-int.chello.nl@[192.168.1.99]>
Delivered-To: submit at bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-2.7 required=4.0 tests=BAYES_01,HAS_PACKAGE,
HTML_60_70,HTML_MESSAGE,HTML_RELAYING_FRAME autolearn=no
version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
This is a multi-part MIME message sent by reportbug.
--===============1159670625==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Package: nagios-common
Version: 2:1.3-0+pre6
Severity: wishlist
Tags: patch
Hi,
First of all, let me thank you for the excellent work you've put into the
maintenance of the Nagios packages. I regularly install Nagios at customer
sites, and it's good to know that Sarge will ship with a decent Nagios
package.
However, there is one additional tweak that I usually apply after a
normal, packaged installation. It's a change described on this site:
http://apan.sourceforge.net/download.html (or just http://apan.sourceforge.net/).
It adds a separate clickable link for every hostgroup in the left pane
of the Nagios web interface. It's very useful when working with many
hostgroups, as the "Service Detail" link may contain too many hosts.
Try it out, I find it really useful!
I've included my first attempt at modifying the source package. At this
point I would just like to know if there is any chance of this suggestion
making it into the Debian package ? If not, I guess I'll have to
maintain this feature in a custom-created Nagios .deb package. If you
do like the feature, I can rework it until it's ready for inclusion into
the Debian package (this is my first attempt at tweaking a Debian package).
The patch works by replacing the side.html file with a dynamically
generated one (grouplist.cgi) that uses two new files: side1.html and
side2.html for the static content, and generates the list of hostgroups
dynamically by parsing the configuration files.
The attached patch modifies the following files:
debian/rules
debian/nagios-common.postinst
debian/00list
debian/patches/08_use_grouplists.dpatch
the 08_use_grouplists.dpatch file modifies the following file in the nagios tarball:
cgi/Makefile.in (modified)
cgi/grouplist.cgi.in (added)
configure (modified)
configure.in (modified)
html/Makefile.in (modified)
html/index.html.in (modified)
html/side.html.in (removed)
html/side1.html.in (added)
html/side2.html.in (added)
Perhaps the grossest thing in the patch is that the file cgi/grouplist.cgi.in
contains hardcoded paths to /etc/nagios/nagios.cfg ...
Regards,
Filip
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.4.28-rc3-mppe
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Versions of packages nagios-common depends on:
ii adduser 3.59 Add and remove users and groups
ii apache [httpd] 1.3.33-2 Versatile, high-performance HTTP s
ii apache2-mpm-pref 2.0.52-3 Traditional model for Apache2
ii coreutils [fileu 5.2.1-2 The GNU core utilities
ii debconf [debconf 1.4.30.11 Debian configuration management sy
ii fileutils 5.2.1-2 The GNU file management utilities
ii mailx 1:8.1.2-0.20040524cvs-4 A simple mail user agent
ii nagios-plugins 1.3.1.0-12 Plugins for the nagios network mon
ii nagios-text [nag 2:1.3-0+pre6 A host/service/network monitoring
-- debconf information excluded
diff -urN orig/nagios-1.3-cvs.20050116/debian/00list new/nagios-1.3-cvs.20050116/debian/00list
--- orig/nagios-1.3-cvs.20050116/debian/patches/00list 2005-01-20 14:47:51.000000000 +0100
+++ new/nagios-1.3-cvs.20050116/debian/patches/00list 2005-01-21 12:56:38.000000000 +0100
@@ -5,5 +5,6 @@
05_fix_script_errors.dpatch
06_makefile.in_delete_defaults.dpatch
07_fix_default_config.dpatch
+08_use_grouplists.dpatch
9999_nsca_pathfix.dpatch
10000_no-password-disclosure.dpatch
diff -urN orig/nagios-1.3-cvs.20050116/debian/nagios-common.postinst new/nagios-1.3-cvs.20050116/debian/nagios-common.postinst
--- orig/nagios-1.3-cvs.20050116/debian/nagios-common.postinst 2005-01-20 14:47:51.000000000 +0100
+++ new/nagios-1.3-cvs.20050116/debian/nagios-common.postinst 2005-01-21 12:46:01.000000000 +0100
@@ -160,7 +160,7 @@
fi
done
- for s in `find $UDIR/index.html $UDIR/main.html $UDIR/side.html $UDIR/robots.txt 2> /dev/null`; do
+ for s in `find $UDIR/index.html $UDIR/main.html $UDIR/side1.html $UDIR/side2.html $UDIR/robots.txt 2> /dev/null`; do
if [ ! -h $s ] ; then
rm -f $s
fi
diff -urN orig/nagios-1.3-cvs.20050116/debian/patches/08_use_grouplists.dpatch new/nagios-1.3-cvs.20050116/debian/patches/08_use_grouplists.dpatch
--- orig/nagios-1.3-cvs.20050116/debian/patches/08_use_grouplists.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ new/nagios-1.3-cvs.20050116/debian/patches/08_use_grouplists.dpatch 2005-01-21 12:44:20.000000000 +0100
@@ -0,0 +1,595 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_use_grouplists.dpatch by Filip Sneppe <filip.sneppe at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Implements the grouplist changes described here:
+## DP: http://apan.sourceforge.net/download.html
+
+ at DPATCH@
+diff -urN nagios-1.3-cvs.20050116/cgi/Makefile.in nagios-1.3-cvs.20050116-new/cgi/Makefile.in
+--- nagios-1.3-cvs.20050116/cgi/Makefile.in 2002-08-26 01:53:00.000000000 +0200
++++ nagios-1.3-cvs.20050116-new/cgi/Makefile.in 2005-01-20 21:25:59.000000000 +0100
+@@ -29,7 +29,7 @@
+ #CFLAGS=-O3 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCGI
+ LDFLAGS=@LDFLAGS@ @LIBS@
+
+-CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi notifications.cgi outages.cgi showlog.cgi status.cgi statuswml.cgi summary.cgi tac.cgi $(CGIEXTRAS)
++CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi grouplist.cgi history.cgi notifications.cgi outages.cgi showlog.cgi status.cgi statuswml.cgi summary.cgi tac.cgi $(CGIEXTRAS)
+
+ # External data I/O code and headers
+ XSDC=@XSDC@
+@@ -94,6 +94,9 @@
+
+ $(COMMENTLIBS): $(COMMENTHDRS)
+
++grouplist.cgi: grouplist.cgi.in
++ cp grouplist.cgi.in grouplist.cgi
++
+ avail.cgi: avail.c $(CGIDEPS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) avail.c $(CGILIBS) -o $@
+
+diff -urN nagios-1.3-cvs.20050116/cgi/grouplist.cgi.in nagios-1.3-cvs.20050116-new/cgi/grouplist.cgi.in
+--- nagios-1.3-cvs.20050116/cgi/grouplist.cgi.in 1970-01-01 01:00:00.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/cgi/grouplist.cgi.in 2005-01-20 21:25:59.000000000 +0100
+@@ -0,0 +1,51 @@
++#!/bin/sh
++
++#Get files and dirs
++CFGFILES=`egrep -e "^cfg_file=" /etc/nagios/nagios.cfg|cut -d "=" -f 2`
++CFGDIRS=`egrep -e "^cfg_dir=" /etc/nagios/nagios.cfg|cut -d "=" -f 2`
++
++#add files in cfg_dir's to filelist
++for CFGDIR in $CFGDIRS; do
++ CFGFILES="$CFGFILES `ls $CFGDIR/*.cfg` "
++done
++
++GROUPLIST=""
++
++# Get groupnames from files
++for CFGFILE in `echo $CFGFILES`; do
++ if [ -f $CFGFILE ]; then
++ HOSTGROUPS=`egrep -e "^[ ]*hostgroup_name" $CFGFILE|awk '{print $2}'| tr "," " "`
++ GROUPLIST="$GROUPLIST $HOSTGROUPS"
++ fi
++done
++
++#Sort and remove duplicated names
++GROUPLIST=`echo $GROUPLIST|tr " " "\n"|sort|uniq`
++#echo "Grouplist: $GROUPLIST"
++
++#Begin the HTML-output
++
++echo "Content-type: text/html"
++echo ""
++
++#Insert the top of the frame
++cat /usr/share/nagios/htdocs/side1.html
++
++#Generate HTML for group-list
++N=0
++for GRP in $GROUPLIST; do
++GRPNAME=`echo $GRP|sed -e 's/ /%2D/g'`
++printf "<tr><td width=13><img src=/nagios/images/greendot.gif"
++printf " width=13 height=14 name=hostgroup$N-dot></td>\n"
++printf "<td nowrap><a href=/nagios/cgi-bin/status.cgi?hostgroup=$GRPNAME"
++printf "&style=detail target=main onMouseOver=switchdot('hostgroup$N-dot',1)"
++printf " onMouseOut=switchdot('hostgroup$N-dot',0) class=NavBarItem>"
++#printf "$N-dot"
++#printf ',0)" class="NavBarItem">'
++printf "$GRP</a></td>\n"
++echo "</tr>"
++N=`echo $N+1|bc`
++done
++
++#Append bottom of frame
++cat /usr/share/nagios/htdocs/side2.html
+diff -urN nagios-1.3-cvs.20050116/configure nagios-1.3-cvs.20050116-new/configure
+--- nagios-1.3-cvs.20050116/configure 2004-10-25 04:32:13.000000000 +0200
++++ nagios-1.3-cvs.20050116-new/configure 2005-01-20 21:26:52.000000000 +0100
+@@ -3317,7 +3317,7 @@
+ ac_given_srcdir=$srcdir
+ ac_given_INSTALL="$INSTALL"
+
+-trap 'rm -fr `echo "Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side.html common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++trap 'rm -fr `echo "Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side1.html html/side2.html common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
+
+@@ -3436,7 +3436,7 @@
+
+ cat >> $CONFIG_STATUS <<EOF
+
+-CONFIG_FILES=\${CONFIG_FILES-"Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side.html"}
++CONFIG_FILES=\${CONFIG_FILES-"Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side1.html html/side2.html"}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+diff -urN nagios-1.3-cvs.20050116/configure.in nagios-1.3-cvs.20050116-new/configure.in
+--- nagios-1.3-cvs.20050116/configure.in 2004-10-25 04:32:13.000000000 +0200
++++ nagios-1.3-cvs.20050116-new/configure.in 2005-01-20 21:25:59.000000000 +0100
+@@ -719,7 +719,7 @@
+ AC_SUBST(INSTALLPERLSTUFF)
+
+ AC_PATH_PROG(PERL,perl)
+-AC_OUTPUT(Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side.html)
++AC_OUTPUT(Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side1.html html/side2.html)
+
+
+ perl subst common/locations.h
+diff -urN nagios-1.3-cvs.20050116/html/Makefile.in nagios-1.3-cvs.20050116-new/html/Makefile.in
+--- nagios-1.3-cvs.20050116/html/Makefile.in 2002-03-01 02:46:43.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/html/Makefile.in 2005-01-20 21:25:59.000000000 +0100
+@@ -26,7 +26,7 @@
+ rm -f docs/*~
+ rm -f docs/images/*.jbf
+ rm -f stylesheets/*~
+- rm -f Makefile index.html side.html
++ rm -f Makefile index.html side1.html side2.html
+
+ distclean: clean
+
+diff -urN nagios-1.3-cvs.20050116/html/index.html.in nagios-1.3-cvs.20050116-new/html/index.html.in
+--- nagios-1.3-cvs.20050116/html/index.html.in 2002-02-26 05:03:37.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/html/index.html.in 2005-01-20 21:25:59.000000000 +0100
+@@ -6,7 +6,7 @@
+ <TITLE>Nagios</TITLE>
+ </HEAD>
+ <FRAMESET BORDER="0" FRAMEBORDER="0" FRAMESPACING="0" COLS="180,*">
+-<FRAME SRC="side.html" NAME="side" TARGET="main">
++<FRAME SRC="/nagios/cgi-bin/grouplist.cgi" NAME="side" TARGET="main">
+ <FRAME SRC="main.html" NAME="main">
+ </FRAMESET>
+
+diff -urN nagios-1.3-cvs.20050116/html/side.html.in nagios-1.3-cvs.20050116-new/html/side.html.in
+--- nagios-1.3-cvs.20050116/html/side.html.in 2002-04-19 04:45:49.000000000 +0200
++++ nagios-1.3-cvs.20050116-new/html/side.html.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,213 +0,0 @@
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+-
+-<HTML>
+-<HEAD>
+-<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
+-<TITLE>Nagios</TITLE>
+-
+-<STYLE type="text/css">
+-
+-<!--
+-
+- A.NavBarItem { font-family: arial,serif; background-color : black; color: #DEE7C6; font-size: 10pt; font-weight: bold; text-decoration: none; }
+- BODY.navbar { font-family: arial,serif; background-color : white; color: black; background-color: black }
+-
+--->
+-
+-</STYLE>
+-
+-</HEAD>
+-
+-<BODY CLASS='navbar'>
+-
+-<SCRIPT LANGUAGE="JavaScript">
+-<!--
+-
+-if(parseInt(navigator.appVersion.substring(0,1))>=3){
+- doton = new Image(13,14);
+- doton.src = "images/orangedot.gif";
+- dotoff = new Image(13,14);
+- dotoff.src = "images/greendot.gif";
+- }
+-
+-function switchdot(name,on){
+- if(parseInt(navigator.appVersion.substring(0,1))>=3){
+- image = eval("" + (on == 1 ? "doton.src" : "dotoff.src"));
+- document[name].src=image;
+- }
+- }
+-
+-//-->
+-</SCRIPT>
+-
+-
+-
+-<table width="150" border="0">
+- <tr>
+- <td>
+- <div align="center"><a href="http://www.nagios.org" target="_blank"><img src="images/sblogo.jpg" border="0" alt="Nagios"></a></div>
+- </td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0">
+- <tr>
+- <td><img src="images/sbgeneral.png" width="147" height="21" alt="-- General --"></td>
+- </tr>
+-</table>
+-
+-<table width=150 border="0" cellpadding=0 cellspacing=0>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="home-dot"></td>
+- <td nowrap width=134><a href="main.html" target="main" onMouseOver="switchdot('home-dot',1)" onMouseOut="switchdot('home-dot',0)" class="NavBarItem">Home</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="docs-dot"></td>
+- <td nowrap><a href="docs/index.html" target="main" onMouseOver="switchdot('docs-dot',1)" onMouseOut="switchdot('docs-dot',0)" class="NavBarItem">Documentation</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0">
+- <tr>
+- <td><img src="images/sbmonitor.png" width="147" height="21" alt="-- Monitoring --"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0" cellpadding=0 cellspacing=0>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="tac-dot"></td>
+- <td nowrap width=134><a href="@cgiurl@/tac.cgi" target="main" onMouseOver="switchdot('tac-dot',1)" onMouseOut="switchdot('tac-dot',0)" class="NavBarItem">Tactical Overview</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="status-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?host=all" target="main" onMouseOver="switchdot('status-dot',1)" onMouseOut="switchdot('status-dot',0)" class="NavBarItem">Service Detail</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hoststatus-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all&style=hostdetail" target="main" onMouseOver="switchdot('hoststatus-dot',1)" onMouseOut="switchdot('hoststatus-dot',0)" class="NavBarItem">Host Detail</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hgstatus-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all" target="main" onMouseOver="switchdot('hgstatus-dot',1)" onMouseOut="switchdot('hgstatus-dot',0)" class="NavBarItem">Status Overview</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hgstatus2-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all&style=summary" target="main" onMouseOver="switchdot('hgstatus2-dot',1)" onMouseOut="switchdot('hgstatus2-dot',0)" class="NavBarItem">Status Summary</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hgstatus3-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all&style=grid" target="main" onMouseOver="switchdot('hgstatus3-dot',1)" onMouseOut="switchdot('hgstatus3-dot',0)" class="NavBarItem">Status Grid</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="statusmap-dot"></td>
+- <td nowrap><a href="@cgiurl@/statusmap.cgi?host=all" target="main" onMouseOver="switchdot('statusmap-dot',1)" onMouseOut="switchdot('statusmap-dot',0)" class="NavBarItem">Status Map</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="statuswrl-dot"></td>
+- <td nowrap><a href="@cgiurl@/statuswrl.cgi?host=all" target="main" onMouseOver="switchdot('statuswrl-dot',1)" onMouseOut="switchdot('statuswrl-dot',0)" class="NavBarItem">3-D Status Map</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="svcproblems-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?host=all&servicestatustypes=248" target="main" onMouseOver="switchdot('svcproblems-dot',1)" onMouseOut="switchdot('svcproblems-dot',0)" class="NavBarItem">Service Problems</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hostproblems-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12" target="main" onMouseOver="switchdot('hostproblems-dot',1)" onMouseOut="switchdot('hostproblems-dot',0)" class="NavBarItem">Host Problems</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="outages-dot"></td>
+- <td nowrap><a href="@cgiurl@/outages.cgi" target="main" onMouseOver="switchdot('outages-dot',1)" onMouseOut="switchdot('outages-dot',0)" class="NavBarItem">Network Outages</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="comment-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=3" target="main" onMouseOver="switchdot('comment-dot',1)" onMouseOut="switchdot('comment-dot',0)" class="NavBarItem">Comments</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="downtime-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=6" target="main" onMouseOver="switchdot('downtime-dot',1)" onMouseOut="switchdot('downtime-dot',0)" class="NavBarItem">Downtime</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="processinfo-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=0" target="main" onMouseOver="switchdot('processinfo-dot',1)" onMouseOut="switchdot('processinfo-dot',0)" class="NavBarItem">Process Info</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="performance-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=4" target="main" onMouseOver="switchdot('performance-dot',1)" onMouseOut="switchdot('performance-dot',0)" class="NavBarItem">Performance Info</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="queue-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=7" target="main" onMouseOver="switchdot('queue-dot',1)" onMouseOut="switchdot('queue-dot',0)" class="NavBarItem">Scheduling Queue</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0">
+- <tr>
+- <td><img src="images/sbreport.png" width="147" height="21" alt="-- Reporting --"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0" cellpadding=0 cellspacing=0>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="trends-dot"></td>
+- <td nowrap width=134><a href="@cgiurl@/trends.cgi" target="main" onMouseOver="switchdot('trends-dot',1)" onMouseOut="switchdot('trends-dot',0)" class="NavBarItem">Trends</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="avail-dot"></td>
+- <td nowrap><a href="@cgiurl@/avail.cgi" target="main" onMouseOver="switchdot('avail-dot',1)" onMouseOut="switchdot('avail-dot',0)" class="NavBarItem">Availability</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="histogram-dot"></td>
+- <td nowrap><a href="@cgiurl@/histogram.cgi" target="main" onMouseOver="switchdot('histogram-dot',1)" onMouseOut="switchdot('histogram-dot',0)" class="NavBarItem">Alert Histogram</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="history-dot"></td>
+- <td nowrap><a href="@cgiurl@/history.cgi?host=all" target="main" onMouseOver="switchdot('history-dot',1)" onMouseOut="switchdot('history-dot',0)" class="NavBarItem">Alert History</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="summary-dot"></td>
+- <td nowrap><a href="@cgiurl@/summary.cgi" target="main" onMouseOver="switchdot('summary-dot',1)" onMouseOut="switchdot('summary-dot',0)" class="NavBarItem">Alert Summary</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="notifications-dot"></td>
+- <td nowrap><a href="@cgiurl@/notifications.cgi?contact=all" target="main" onMouseOver="switchdot('notifications-dot',1)" onMouseOut="switchdot('notifications-dot',0)" class="NavBarItem">Notifications</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="logfile-dot"></td>
+- <td nowrap><a href="@cgiurl@/showlog.cgi" target="main" onMouseOver="switchdot('logfile-dot',1)" onMouseOut="switchdot('logfile-dot',0)" class="NavBarItem">Event Log</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+-</table>
+-
+-
+-<table width="150" border="0">
+- <tr>
+- <td><img src="images/sbconfig.png" width="147" height="21" alt="-- Configuration --"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0" cellpadding=0 cellspacing=0>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="config-dot"></td>
+- <td nowrap width=134><a href="@cgiurl@/config.cgi" target="main" onMouseOver="switchdot('config-dot',1)" onMouseOut="switchdot('config-dot',0)" class="NavBarItem">View Config</a></td>
+- </tr>
+-</table>
+-
+-</BODY>
+-</HTML>
+diff -urN nagios-1.3-cvs.20050116/html/side1.html.in nagios-1.3-cvs.20050116-new/html/side1.html.in
+--- nagios-1.3-cvs.20050116/html/side1.html.in 1970-01-01 01:00:00.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/html/side1.html.in 2005-01-20 21:25:59.000000000 +0100
+@@ -0,0 +1,91 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
++
++<HTML>
++<HEAD>
++<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
++<TITLE>Nagios</TITLE>
++
++<STYLE type="text/css">
++
++<!--
++
++ A.NavBarItem { font-family: arial,serif; background-color : black; color: #DEE7C6; font-size: 10pt; font-weight: bold; text-decoration: none; }
++ BODY.navbar { font-family: arial,serif; background-color : white; color: black; background-color: black }
++
++-->
++
++</STYLE>
++
++</HEAD>
++
++<BODY CLASS='navbar'>
++
++<SCRIPT LANGUAGE="JavaScript">
++<!--
++
++if(parseInt(navigator.appVersion.substring(0,1))>=3){
++ doton = new Image(13,14);
++ doton.src = "/nagios/images/orangedot.gif";
++ dotoff = new Image(13,14);
++ dotoff.src = "/nagios/images/greendot.gif";
++ }
++
++function switchdot(name,on){
++ if(parseInt(navigator.appVersion.substring(0,1))>=3){
++ image = eval("" + (on == 1 ? "doton.src" : "dotoff.src"));
++ document[name].src=image;
++ }
++ }
++
++//-->
++</SCRIPT>
++
++
++
++<table width="150" border="0">
++ <tr>
++ <td>
++ <div align="center"><a href="http://www.nagios.org" target="_blank"><img src="/nagios/images/sblogo.jpg" border="0" alt="Nagios"></a></div>
++ </td>
++ </tr>
++</table>
++
++<table width="150" border="0">
++ <tr>
++ <td><img src="/nagios/images/sbgeneral.png" width="147" height="21" alt="-- General --"></td>
++ </tr>
++</table>
++
++<table width=150 border="0" cellpadding=0 cellspacing=0>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="home-dot"></td>
++ <td nowrap width=134><a href="/nagios/main.html" target="main" onMouseOver="switchdot('home-dot',1)" onMouseOut="switchdot('home-dot',0)" class="NavBarItem">Home</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="docs-dot"></td>
++ <td nowrap><a href="/nagios/docs/index.html" target="main" onMouseOver="switchdot('docs-dot',1)" onMouseOut="switchdot('docs-dot',0)" class="NavBarItem">Documentation</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++</table>
++
++<table width="150" border="0">
++ <tr>
++ <td><img src="/nagios/images/sbmonitor.png" width="147" height="21" alt="-- Monitoring --"></td>
++ </tr>
++</table>
++
++<table width="150" border="0" cellpadding=0 cellspacing=0>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="tac-dot"></td>
++ <td nowrap width=134><a href="/nagios/cgi-bin/tac.cgi" target="main" onMouseOver="switchdot('tac-dot',1)" onMouseOut="switchdot('tac-dot',0)" class="NavBarItem">Tactical Overview</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="status-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?host=all" target="main" onMouseOver="switchdot('status-dot',1)" onMouseOut="switchdot('status-dot',0)" class="NavBarItem">Service Detail</a></td>
++ </tr>
++ <tr>
++ <td width=13></td>
++ <td nowrap>
++ <table border="0" cellpadding=0 cellspacing=0>
+diff -urN nagios-1.3-cvs.20050116/html/side2.html.in nagios-1.3-cvs.20050116-new/html/side2.html.in
+--- nagios-1.3-cvs.20050116/html/side2.html.in 1970-01-01 01:00:00.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/html/side2.html.in 2005-01-20 21:25:59.000000000 +0100
+@@ -0,0 +1,137 @@
++ </table>
++ </tr>
++
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hoststatus-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all&style=hostdetail" target="main" onMouseOver="switchdot('hoststatus-dot',1)" onMouseOut="switchdot('hoststatus-dot',0)" class="NavBarItem">Host Detail</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hgstatus-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all" target="main" onMouseOver="switchdot('hgstatus-dot',1)" onMouseOut="switchdot('hgstatus-dot',0)" class="NavBarItem">Status Overview</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hgstatus2-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all&style=summary" target="main" onMouseOver="switchdot('hgstatus2-dot',1)" onMouseOut="switchdot('hgstatus2-dot',0)" class="NavBarItem">Status Summary</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hgstatus3-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all&style=grid" target="main" onMouseOver="switchdot('hgstatus3-dot',1)" onMouseOut="switchdot('hgstatus3-dot',0)" class="NavBarItem">Status Grid</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="statusmap-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/statusmap.cgi?host=all" target="main" onMouseOver="switchdot('statusmap-dot',1)" onMouseOut="switchdot('statusmap-dot',0)" class="NavBarItem">Status Map</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="statuswrl-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/statuswrl.cgi?host=all" target="main" onMouseOver="switchdot('statuswrl-dot',1)" onMouseOut="switchdot('statuswrl-dot',0)" class="NavBarItem">3-D Status Map</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="svcproblems-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?host=all&servicestatustypes=248" target="main" onMouseOver="switchdot('svcproblems-dot',1)" onMouseOut="switchdot('svcproblems-dot',0)" class="NavBarItem">Service Problems</a></td>
++ </tr>
++ <tr>
++
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="svcproblems2-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?host=all&servicestatustypes=248&sorttype=2&sortoption=3&noheader" target="_blank" onMouseOver="switchdot('svcproblems2-dot',1)" onMouseOut="switchdot('svcproblems2-dot',0)" class="NavBarItem">Service Problems 2</a></td>
++ </tr>
++ <tr>
++
++
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hostproblems-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12" target="main" onMouseOver="switchdot('hostproblems-dot',1)" onMouseOut="switchdot('hostproblems-dot',0)" class="NavBarItem">Host Problems</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="outages-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/outages.cgi" target="main" onMouseOver="switchdot('outages-dot',1)" onMouseOut="switchdot('outages-dot',0)" class="NavBarItem">Network Outages</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="comment-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=3" target="main" onMouseOver="switchdot('comment-dot',1)" onMouseOut="switchdot('comment-dot',0)" class="NavBarItem">Comments</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="downtime-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=6" target="main" onMouseOver="switchdot('downtime-dot',1)" onMouseOut="switchdot('downtime-dot',0)" class="NavBarItem">Downtime</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="processinfo-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=0" target="main" onMouseOver="switchdot('processinfo-dot',1)" onMouseOut="switchdot('processinfo-dot',0)" class="NavBarItem">Process Info</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="performance-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=4" target="main" onMouseOver="switchdot('performance-dot',1)" onMouseOut="switchdot('performance-dot',0)" class="NavBarItem">Performance Info</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="queue-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=7" target="main" onMouseOver="switchdot('queue-dot',1)" onMouseOut="switchdot('queue-dot',0)" class="NavBarItem">Scheduling Queue</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++</table>
++
++<table width="150" border="0">
++ <tr>
++ <td><img src="/nagios/images/sbreport.png" width="147" height="21" alt="-- Reporting --"></td>
++ </tr>
++</table>
++
++<table width="150" border="0" cellpadding=0 cellspacing=0>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="trends-dot"></td>
++ <td nowrap width=134><a href="/nagios/cgi-bin/trends.cgi" target="main" onMouseOver="switchdot('trends-dot',1)" onMouseOut="switchdot('trends-dot',0)" class="NavBarItem">Trends</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="avail-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/avail.cgi" target="main" onMouseOver="switchdot('avail-dot',1)" onMouseOut="switchdot('avail-dot',0)" class="NavBarItem">Availability</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="histogram-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/histogram.cgi" target="main" onMouseOver="switchdot('histogram-dot',1)" onMouseOut="switchdot('histogram-dot',0)" class="NavBarItem">Alert Histogram</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="history-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/history.cgi?host=all" target="main" onMouseOver="switchdot('history-dot',1)" onMouseOut="switchdot('history-dot',0)" class="NavBarItem">Alert History</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="summary-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/summary.cgi" target="main" onMouseOver="switchdot('summary-dot',1)" onMouseOut="switchdot('summary-dot',0)" class="NavBarItem">Alert Summary</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="notifications-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/notifications.cgi?contact=all" target="main" onMouseOver="switchdot('notifications-dot',1)" onMouseOut="switchdot('notifications-dot',0)" class="NavBarItem">Notifications</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="logfile-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/showlog.cgi" target="main" onMouseOver="switchdot('logfile-dot',1)" onMouseOut="switchdot('logfile-dot',0)" class="NavBarItem">Event Log</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++</table>
++
++
++<table width="150" border="0">
++ <tr>
++ <td><img src="/nagios/images/sbconfig.png" width="147" height="21" alt="-- Configuration --"></td>
++ </tr>
++</table>
++
++<table width="150" border="0" cellpadding=0 cellspacing=0>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="config-dot"></td>
++ <td nowrap width=134><a href="/nagios/cgi-bin/config.cgi" target="main" onMouseOver="switchdot('config-dot',1)" onMouseOut="switchdot('config-dot',0)" class="NavBarItem">View Config</a></td>
++ </tr>
++</table>
++
++</BODY>
++</HTML>
diff -urN orig/nagios-1.3-cvs.20050116/debian/rules new/nagios-1.3-cvs.20050116/debian/rules
--- orig/nagios-1.3-cvs.20050116/debian/rules 2005-01-20 14:47:51.000000000 +0100
+++ new/nagios-1.3-cvs.20050116/debian/rules 2005-01-21 12:46:01.000000000 +0100
@@ -10,7 +10,7 @@
maindir = $(shell pwd)
b = $(shell pwd)/debian
-CGIBINS = avail cmd config extinfo histogram history notifications outages showlog status statusmap statuswml statuswrl summary tac trends
+CGIBINS = avail cmd config extinfo grouplist histogram history notifications outages showlog status statusmap statuswml statuswrl summary tac trends
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
--===============1159670625==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff.nagios.grouplist.patch"
diff -urN orig/nagios-1.3-cvs.20050116/debian/00list new/nagios-1.3-cvs.20050116/debian/00list
--- orig/nagios-1.3-cvs.20050116/debian/patches/00list 2005-01-20 14:47:51.000000000 +0100
+++ new/nagios-1.3-cvs.20050116/debian/patches/00list 2005-01-21 12:56:38.000000000 +0100
@@ -5,5 +5,6 @@
05_fix_script_errors.dpatch
06_makefile.in_delete_defaults.dpatch
07_fix_default_config.dpatch
+08_use_grouplists.dpatch
9999_nsca_pathfix.dpatch
10000_no-password-disclosure.dpatch
diff -urN orig/nagios-1.3-cvs.20050116/debian/nagios-common.postinst new/nagios-1.3-cvs.20050116/debian/nagios-common.postinst
--- orig/nagios-1.3-cvs.20050116/debian/nagios-common.postinst 2005-01-20 14:47:51.000000000 +0100
+++ new/nagios-1.3-cvs.20050116/debian/nagios-common.postinst 2005-01-21 12:46:01.000000000 +0100
@@ -160,7 +160,7 @@
fi
done
- for s in `find $UDIR/index.html $UDIR/main.html $UDIR/side.html $UDIR/robots.txt 2> /dev/null`; do
+ for s in `find $UDIR/index.html $UDIR/main.html $UDIR/side1.html $UDIR/side2.html $UDIR/robots.txt 2> /dev/null`; do
if [ ! -h $s ] ; then
rm -f $s
fi
diff -urN orig/nagios-1.3-cvs.20050116/debian/patches/08_use_grouplists.dpatch new/nagios-1.3-cvs.20050116/debian/patches/08_use_grouplists.dpatch
--- orig/nagios-1.3-cvs.20050116/debian/patches/08_use_grouplists.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ new/nagios-1.3-cvs.20050116/debian/patches/08_use_grouplists.dpatch 2005-01-21 12:44:20.000000000 +0100
@@ -0,0 +1,595 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_use_grouplists.dpatch by Filip Sneppe <filip.sneppe at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Implements the grouplist changes described here:
+## DP: http://apan.sourceforge.net/download.html
+
+ at DPATCH@
+diff -urN nagios-1.3-cvs.20050116/cgi/Makefile.in nagios-1.3-cvs.20050116-new/cgi/Makefile.in
+--- nagios-1.3-cvs.20050116/cgi/Makefile.in 2002-08-26 01:53:00.000000000 +0200
++++ nagios-1.3-cvs.20050116-new/cgi/Makefile.in 2005-01-20 21:25:59.000000000 +0100
+@@ -29,7 +29,7 @@
+ #CFLAGS=-O3 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCGI
+ LDFLAGS=@LDFLAGS@ @LIBS@
+
+-CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi notifications.cgi outages.cgi showlog.cgi status.cgi statuswml.cgi summary.cgi tac.cgi $(CGIEXTRAS)
++CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi grouplist.cgi history.cgi notifications.cgi outages.cgi showlog.cgi status.cgi statuswml.cgi summary.cgi tac.cgi $(CGIEXTRAS)
+
+ # External data I/O code and headers
+ XSDC=@XSDC@
+@@ -94,6 +94,9 @@
+
+ $(COMMENTLIBS): $(COMMENTHDRS)
+
++grouplist.cgi: grouplist.cgi.in
++ cp grouplist.cgi.in grouplist.cgi
++
+ avail.cgi: avail.c $(CGIDEPS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) avail.c $(CGILIBS) -o $@
+
+diff -urN nagios-1.3-cvs.20050116/cgi/grouplist.cgi.in nagios-1.3-cvs.20050116-new/cgi/grouplist.cgi.in
+--- nagios-1.3-cvs.20050116/cgi/grouplist.cgi.in 1970-01-01 01:00:00.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/cgi/grouplist.cgi.in 2005-01-20 21:25:59.000000000 +0100
+@@ -0,0 +1,51 @@
++#!/bin/sh
++
++#Get files and dirs
++CFGFILES=`egrep -e "^cfg_file=" /etc/nagios/nagios.cfg|cut -d "=" -f 2`
++CFGDIRS=`egrep -e "^cfg_dir=" /etc/nagios/nagios.cfg|cut -d "=" -f 2`
++
++#add files in cfg_dir's to filelist
++for CFGDIR in $CFGDIRS; do
++ CFGFILES="$CFGFILES `ls $CFGDIR/*.cfg` "
++done
++
++GROUPLIST=""
++
++# Get groupnames from files
++for CFGFILE in `echo $CFGFILES`; do
++ if [ -f $CFGFILE ]; then
++ HOSTGROUPS=`egrep -e "^[ ]*hostgroup_name" $CFGFILE|awk '{print $2}'| tr "," " "`
++ GROUPLIST="$GROUPLIST $HOSTGROUPS"
++ fi
++done
++
++#Sort and remove duplicated names
++GROUPLIST=`echo $GROUPLIST|tr " " "\n"|sort|uniq`
++#echo "Grouplist: $GROUPLIST"
++
++#Begin the HTML-output
++
++echo "Content-type: text/html"
++echo ""
++
++#Insert the top of the frame
++cat /usr/share/nagios/htdocs/side1.html
++
++#Generate HTML for group-list
++N=0
++for GRP in $GROUPLIST; do
++GRPNAME=`echo $GRP|sed -e 's/ /%2D/g'`
++printf "<tr><td width=13><img src=/nagios/images/greendot.gif"
++printf " width=13 height=14 name=hostgroup$N-dot></td>\n"
++printf "<td nowrap><a href=/nagios/cgi-bin/status.cgi?hostgroup=$GRPNAME"
++printf "&style=detail target=main onMouseOver=switchdot('hostgroup$N-dot',1)"
++printf " onMouseOut=switchdot('hostgroup$N-dot',0) class=NavBarItem>"
++#printf "$N-dot"
++#printf ',0)" class="NavBarItem">'
++printf "$GRP</a></td>\n"
++echo "</tr>"
++N=`echo $N+1|bc`
++done
++
++#Append bottom of frame
++cat /usr/share/nagios/htdocs/side2.html
+diff -urN nagios-1.3-cvs.20050116/configure nagios-1.3-cvs.20050116-new/configure
+--- nagios-1.3-cvs.20050116/configure 2004-10-25 04:32:13.000000000 +0200
++++ nagios-1.3-cvs.20050116-new/configure 2005-01-20 21:26:52.000000000 +0100
+@@ -3317,7 +3317,7 @@
+ ac_given_srcdir=$srcdir
+ ac_given_INSTALL="$INSTALL"
+
+-trap 'rm -fr `echo "Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side.html common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++trap 'rm -fr `echo "Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side1.html html/side2.html common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
+
+@@ -3436,7 +3436,7 @@
+
+ cat >> $CONFIG_STATUS <<EOF
+
+-CONFIG_FILES=\${CONFIG_FILES-"Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side.html"}
++CONFIG_FILES=\${CONFIG_FILES-"Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side1.html html/side2.html"}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+diff -urN nagios-1.3-cvs.20050116/configure.in nagios-1.3-cvs.20050116-new/configure.in
+--- nagios-1.3-cvs.20050116/configure.in 2004-10-25 04:32:13.000000000 +0200
++++ nagios-1.3-cvs.20050116-new/configure.in 2005-01-20 21:25:59.000000000 +0100
+@@ -719,7 +719,7 @@
+ AC_SUBST(INSTALLPERLSTUFF)
+
+ AC_PATH_PROG(PERL,perl)
+-AC_OUTPUT(Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side.html)
++AC_OUTPUT(Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile xdata/Makefile daemon-init html/index.html html/side1.html html/side2.html)
+
+
+ perl subst common/locations.h
+diff -urN nagios-1.3-cvs.20050116/html/Makefile.in nagios-1.3-cvs.20050116-new/html/Makefile.in
+--- nagios-1.3-cvs.20050116/html/Makefile.in 2002-03-01 02:46:43.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/html/Makefile.in 2005-01-20 21:25:59.000000000 +0100
+@@ -26,7 +26,7 @@
+ rm -f docs/*~
+ rm -f docs/images/*.jbf
+ rm -f stylesheets/*~
+- rm -f Makefile index.html side.html
++ rm -f Makefile index.html side1.html side2.html
+
+ distclean: clean
+
+diff -urN nagios-1.3-cvs.20050116/html/index.html.in nagios-1.3-cvs.20050116-new/html/index.html.in
+--- nagios-1.3-cvs.20050116/html/index.html.in 2002-02-26 05:03:37.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/html/index.html.in 2005-01-20 21:25:59.000000000 +0100
+@@ -6,7 +6,7 @@
+ <TITLE>Nagios</TITLE>
+ </HEAD>
+ <FRAMESET BORDER="0" FRAMEBORDER="0" FRAMESPACING="0" COLS="180,*">
+-<FRAME SRC="side.html" NAME="side" TARGET="main">
++<FRAME SRC="/nagios/cgi-bin/grouplist.cgi" NAME="side" TARGET="main">
+ <FRAME SRC="main.html" NAME="main">
+ </FRAMESET>
+
+diff -urN nagios-1.3-cvs.20050116/html/side.html.in nagios-1.3-cvs.20050116-new/html/side.html.in
+--- nagios-1.3-cvs.20050116/html/side.html.in 2002-04-19 04:45:49.000000000 +0200
++++ nagios-1.3-cvs.20050116-new/html/side.html.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,213 +0,0 @@
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+-
+-<HTML>
+-<HEAD>
+-<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
+-<TITLE>Nagios</TITLE>
+-
+-<STYLE type="text/css">
+-
+-<!--
+-
+- A.NavBarItem { font-family: arial,serif; background-color : black; color: #DEE7C6; font-size: 10pt; font-weight: bold; text-decoration: none; }
+- BODY.navbar { font-family: arial,serif; background-color : white; color: black; background-color: black }
+-
+--->
+-
+-</STYLE>
+-
+-</HEAD>
+-
+-<BODY CLASS='navbar'>
+-
+-<SCRIPT LANGUAGE="JavaScript">
+-<!--
+-
+-if(parseInt(navigator.appVersion.substring(0,1))>=3){
+- doton = new Image(13,14);
+- doton.src = "images/orangedot.gif";
+- dotoff = new Image(13,14);
+- dotoff.src = "images/greendot.gif";
+- }
+-
+-function switchdot(name,on){
+- if(parseInt(navigator.appVersion.substring(0,1))>=3){
+- image = eval("" + (on == 1 ? "doton.src" : "dotoff.src"));
+- document[name].src=image;
+- }
+- }
+-
+-//-->
+-</SCRIPT>
+-
+-
+-
+-<table width="150" border="0">
+- <tr>
+- <td>
+- <div align="center"><a href="http://www.nagios.org" target="_blank"><img src="images/sblogo.jpg" border="0" alt="Nagios"></a></div>
+- </td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0">
+- <tr>
+- <td><img src="images/sbgeneral.png" width="147" height="21" alt="-- General --"></td>
+- </tr>
+-</table>
+-
+-<table width=150 border="0" cellpadding=0 cellspacing=0>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="home-dot"></td>
+- <td nowrap width=134><a href="main.html" target="main" onMouseOver="switchdot('home-dot',1)" onMouseOut="switchdot('home-dot',0)" class="NavBarItem">Home</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="docs-dot"></td>
+- <td nowrap><a href="docs/index.html" target="main" onMouseOver="switchdot('docs-dot',1)" onMouseOut="switchdot('docs-dot',0)" class="NavBarItem">Documentation</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0">
+- <tr>
+- <td><img src="images/sbmonitor.png" width="147" height="21" alt="-- Monitoring --"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0" cellpadding=0 cellspacing=0>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="tac-dot"></td>
+- <td nowrap width=134><a href="@cgiurl@/tac.cgi" target="main" onMouseOver="switchdot('tac-dot',1)" onMouseOut="switchdot('tac-dot',0)" class="NavBarItem">Tactical Overview</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="status-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?host=all" target="main" onMouseOver="switchdot('status-dot',1)" onMouseOut="switchdot('status-dot',0)" class="NavBarItem">Service Detail</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hoststatus-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all&style=hostdetail" target="main" onMouseOver="switchdot('hoststatus-dot',1)" onMouseOut="switchdot('hoststatus-dot',0)" class="NavBarItem">Host Detail</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hgstatus-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all" target="main" onMouseOver="switchdot('hgstatus-dot',1)" onMouseOut="switchdot('hgstatus-dot',0)" class="NavBarItem">Status Overview</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hgstatus2-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all&style=summary" target="main" onMouseOver="switchdot('hgstatus2-dot',1)" onMouseOut="switchdot('hgstatus2-dot',0)" class="NavBarItem">Status Summary</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hgstatus3-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all&style=grid" target="main" onMouseOver="switchdot('hgstatus3-dot',1)" onMouseOut="switchdot('hgstatus3-dot',0)" class="NavBarItem">Status Grid</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="statusmap-dot"></td>
+- <td nowrap><a href="@cgiurl@/statusmap.cgi?host=all" target="main" onMouseOver="switchdot('statusmap-dot',1)" onMouseOut="switchdot('statusmap-dot',0)" class="NavBarItem">Status Map</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="statuswrl-dot"></td>
+- <td nowrap><a href="@cgiurl@/statuswrl.cgi?host=all" target="main" onMouseOver="switchdot('statuswrl-dot',1)" onMouseOut="switchdot('statuswrl-dot',0)" class="NavBarItem">3-D Status Map</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="svcproblems-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?host=all&servicestatustypes=248" target="main" onMouseOver="switchdot('svcproblems-dot',1)" onMouseOut="switchdot('svcproblems-dot',0)" class="NavBarItem">Service Problems</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="hostproblems-dot"></td>
+- <td nowrap><a href="@cgiurl@/status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12" target="main" onMouseOver="switchdot('hostproblems-dot',1)" onMouseOut="switchdot('hostproblems-dot',0)" class="NavBarItem">Host Problems</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="outages-dot"></td>
+- <td nowrap><a href="@cgiurl@/outages.cgi" target="main" onMouseOver="switchdot('outages-dot',1)" onMouseOut="switchdot('outages-dot',0)" class="NavBarItem">Network Outages</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="comment-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=3" target="main" onMouseOver="switchdot('comment-dot',1)" onMouseOut="switchdot('comment-dot',0)" class="NavBarItem">Comments</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="downtime-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=6" target="main" onMouseOver="switchdot('downtime-dot',1)" onMouseOut="switchdot('downtime-dot',0)" class="NavBarItem">Downtime</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="processinfo-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=0" target="main" onMouseOver="switchdot('processinfo-dot',1)" onMouseOut="switchdot('processinfo-dot',0)" class="NavBarItem">Process Info</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="performance-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=4" target="main" onMouseOver="switchdot('performance-dot',1)" onMouseOut="switchdot('performance-dot',0)" class="NavBarItem">Performance Info</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="queue-dot"></td>
+- <td nowrap><a href="@cgiurl@/extinfo.cgi?&type=7" target="main" onMouseOver="switchdot('queue-dot',1)" onMouseOut="switchdot('queue-dot',0)" class="NavBarItem">Scheduling Queue</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0">
+- <tr>
+- <td><img src="images/sbreport.png" width="147" height="21" alt="-- Reporting --"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0" cellpadding=0 cellspacing=0>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="trends-dot"></td>
+- <td nowrap width=134><a href="@cgiurl@/trends.cgi" target="main" onMouseOver="switchdot('trends-dot',1)" onMouseOut="switchdot('trends-dot',0)" class="NavBarItem">Trends</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="avail-dot"></td>
+- <td nowrap><a href="@cgiurl@/avail.cgi" target="main" onMouseOver="switchdot('avail-dot',1)" onMouseOut="switchdot('avail-dot',0)" class="NavBarItem">Availability</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="histogram-dot"></td>
+- <td nowrap><a href="@cgiurl@/histogram.cgi" target="main" onMouseOver="switchdot('histogram-dot',1)" onMouseOut="switchdot('histogram-dot',0)" class="NavBarItem">Alert Histogram</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="history-dot"></td>
+- <td nowrap><a href="@cgiurl@/history.cgi?host=all" target="main" onMouseOver="switchdot('history-dot',1)" onMouseOut="switchdot('history-dot',0)" class="NavBarItem">Alert History</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="summary-dot"></td>
+- <td nowrap><a href="@cgiurl@/summary.cgi" target="main" onMouseOver="switchdot('summary-dot',1)" onMouseOut="switchdot('summary-dot',0)" class="NavBarItem">Alert Summary</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="notifications-dot"></td>
+- <td nowrap><a href="@cgiurl@/notifications.cgi?contact=all" target="main" onMouseOver="switchdot('notifications-dot',1)" onMouseOut="switchdot('notifications-dot',0)" class="NavBarItem">Notifications</a></td>
+- </tr>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="logfile-dot"></td>
+- <td nowrap><a href="@cgiurl@/showlog.cgi" target="main" onMouseOver="switchdot('logfile-dot',1)" onMouseOut="switchdot('logfile-dot',0)" class="NavBarItem">Event Log</a></td>
+- </tr>
+- <tr>
+- <td colspan="2" height="10"></td>
+- </tr>
+-</table>
+-
+-
+-<table width="150" border="0">
+- <tr>
+- <td><img src="images/sbconfig.png" width="147" height="21" alt="-- Configuration --"></td>
+- </tr>
+-</table>
+-
+-<table width="150" border="0" cellpadding=0 cellspacing=0>
+- <tr>
+- <td width=13><img src="images/greendot.gif" width="13" height="14" name="config-dot"></td>
+- <td nowrap width=134><a href="@cgiurl@/config.cgi" target="main" onMouseOver="switchdot('config-dot',1)" onMouseOut="switchdot('config-dot',0)" class="NavBarItem">View Config</a></td>
+- </tr>
+-</table>
+-
+-</BODY>
+-</HTML>
+diff -urN nagios-1.3-cvs.20050116/html/side1.html.in nagios-1.3-cvs.20050116-new/html/side1.html.in
+--- nagios-1.3-cvs.20050116/html/side1.html.in 1970-01-01 01:00:00.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/html/side1.html.in 2005-01-20 21:25:59.000000000 +0100
+@@ -0,0 +1,91 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
++
++<HTML>
++<HEAD>
++<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
++<TITLE>Nagios</TITLE>
++
++<STYLE type="text/css">
++
++<!--
++
++ A.NavBarItem { font-family: arial,serif; background-color : black; color: #DEE7C6; font-size: 10pt; font-weight: bold; text-decoration: none; }
++ BODY.navbar { font-family: arial,serif; background-color : white; color: black; background-color: black }
++
++-->
++
++</STYLE>
++
++</HEAD>
++
++<BODY CLASS='navbar'>
++
++<SCRIPT LANGUAGE="JavaScript">
++<!--
++
++if(parseInt(navigator.appVersion.substring(0,1))>=3){
++ doton = new Image(13,14);
++ doton.src = "/nagios/images/orangedot.gif";
++ dotoff = new Image(13,14);
++ dotoff.src = "/nagios/images/greendot.gif";
++ }
++
++function switchdot(name,on){
++ if(parseInt(navigator.appVersion.substring(0,1))>=3){
++ image = eval("" + (on == 1 ? "doton.src" : "dotoff.src"));
++ document[name].src=image;
++ }
++ }
++
++//-->
++</SCRIPT>
++
++
++
++<table width="150" border="0">
++ <tr>
++ <td>
++ <div align="center"><a href="http://www.nagios.org" target="_blank"><img src="/nagios/images/sblogo.jpg" border="0" alt="Nagios"></a></div>
++ </td>
++ </tr>
++</table>
++
++<table width="150" border="0">
++ <tr>
++ <td><img src="/nagios/images/sbgeneral.png" width="147" height="21" alt="-- General --"></td>
++ </tr>
++</table>
++
++<table width=150 border="0" cellpadding=0 cellspacing=0>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="home-dot"></td>
++ <td nowrap width=134><a href="/nagios/main.html" target="main" onMouseOver="switchdot('home-dot',1)" onMouseOut="switchdot('home-dot',0)" class="NavBarItem">Home</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="docs-dot"></td>
++ <td nowrap><a href="/nagios/docs/index.html" target="main" onMouseOver="switchdot('docs-dot',1)" onMouseOut="switchdot('docs-dot',0)" class="NavBarItem">Documentation</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++</table>
++
++<table width="150" border="0">
++ <tr>
++ <td><img src="/nagios/images/sbmonitor.png" width="147" height="21" alt="-- Monitoring --"></td>
++ </tr>
++</table>
++
++<table width="150" border="0" cellpadding=0 cellspacing=0>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="tac-dot"></td>
++ <td nowrap width=134><a href="/nagios/cgi-bin/tac.cgi" target="main" onMouseOver="switchdot('tac-dot',1)" onMouseOut="switchdot('tac-dot',0)" class="NavBarItem">Tactical Overview</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="status-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?host=all" target="main" onMouseOver="switchdot('status-dot',1)" onMouseOut="switchdot('status-dot',0)" class="NavBarItem">Service Detail</a></td>
++ </tr>
++ <tr>
++ <td width=13></td>
++ <td nowrap>
++ <table border="0" cellpadding=0 cellspacing=0>
+diff -urN nagios-1.3-cvs.20050116/html/side2.html.in nagios-1.3-cvs.20050116-new/html/side2.html.in
+--- nagios-1.3-cvs.20050116/html/side2.html.in 1970-01-01 01:00:00.000000000 +0100
++++ nagios-1.3-cvs.20050116-new/html/side2.html.in 2005-01-20 21:25:59.000000000 +0100
+@@ -0,0 +1,137 @@
++ </table>
++ </tr>
++
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hoststatus-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all&style=hostdetail" target="main" onMouseOver="switchdot('hoststatus-dot',1)" onMouseOut="switchdot('hoststatus-dot',0)" class="NavBarItem">Host Detail</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hgstatus-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all" target="main" onMouseOver="switchdot('hgstatus-dot',1)" onMouseOut="switchdot('hgstatus-dot',0)" class="NavBarItem">Status Overview</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hgstatus2-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all&style=summary" target="main" onMouseOver="switchdot('hgstatus2-dot',1)" onMouseOut="switchdot('hgstatus2-dot',0)" class="NavBarItem">Status Summary</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hgstatus3-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all&style=grid" target="main" onMouseOver="switchdot('hgstatus3-dot',1)" onMouseOut="switchdot('hgstatus3-dot',0)" class="NavBarItem">Status Grid</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="statusmap-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/statusmap.cgi?host=all" target="main" onMouseOver="switchdot('statusmap-dot',1)" onMouseOut="switchdot('statusmap-dot',0)" class="NavBarItem">Status Map</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="statuswrl-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/statuswrl.cgi?host=all" target="main" onMouseOver="switchdot('statuswrl-dot',1)" onMouseOut="switchdot('statuswrl-dot',0)" class="NavBarItem">3-D Status Map</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="svcproblems-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?host=all&servicestatustypes=248" target="main" onMouseOver="switchdot('svcproblems-dot',1)" onMouseOut="switchdot('svcproblems-dot',0)" class="NavBarItem">Service Problems</a></td>
++ </tr>
++ <tr>
++
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="svcproblems2-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?host=all&servicestatustypes=248&sorttype=2&sortoption=3&noheader" target="_blank" onMouseOver="switchdot('svcproblems2-dot',1)" onMouseOut="switchdot('svcproblems2-dot',0)" class="NavBarItem">Service Problems 2</a></td>
++ </tr>
++ <tr>
++
++
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="hostproblems-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12" target="main" onMouseOver="switchdot('hostproblems-dot',1)" onMouseOut="switchdot('hostproblems-dot',0)" class="NavBarItem">Host Problems</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="outages-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/outages.cgi" target="main" onMouseOver="switchdot('outages-dot',1)" onMouseOut="switchdot('outages-dot',0)" class="NavBarItem">Network Outages</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="comment-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=3" target="main" onMouseOver="switchdot('comment-dot',1)" onMouseOut="switchdot('comment-dot',0)" class="NavBarItem">Comments</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="downtime-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=6" target="main" onMouseOver="switchdot('downtime-dot',1)" onMouseOut="switchdot('downtime-dot',0)" class="NavBarItem">Downtime</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="processinfo-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=0" target="main" onMouseOver="switchdot('processinfo-dot',1)" onMouseOut="switchdot('processinfo-dot',0)" class="NavBarItem">Process Info</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="performance-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=4" target="main" onMouseOver="switchdot('performance-dot',1)" onMouseOut="switchdot('performance-dot',0)" class="NavBarItem">Performance Info</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="queue-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/extinfo.cgi?&type=7" target="main" onMouseOver="switchdot('queue-dot',1)" onMouseOut="switchdot('queue-dot',0)" class="NavBarItem">Scheduling Queue</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++</table>
++
++<table width="150" border="0">
++ <tr>
++ <td><img src="/nagios/images/sbreport.png" width="147" height="21" alt="-- Reporting --"></td>
++ </tr>
++</table>
++
++<table width="150" border="0" cellpadding=0 cellspacing=0>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="trends-dot"></td>
++ <td nowrap width=134><a href="/nagios/cgi-bin/trends.cgi" target="main" onMouseOver="switchdot('trends-dot',1)" onMouseOut="switchdot('trends-dot',0)" class="NavBarItem">Trends</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="avail-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/avail.cgi" target="main" onMouseOver="switchdot('avail-dot',1)" onMouseOut="switchdot('avail-dot',0)" class="NavBarItem">Availability</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="histogram-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/histogram.cgi" target="main" onMouseOver="switchdot('histogram-dot',1)" onMouseOut="switchdot('histogram-dot',0)" class="NavBarItem">Alert Histogram</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="history-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/history.cgi?host=all" target="main" onMouseOver="switchdot('history-dot',1)" onMouseOut="switchdot('history-dot',0)" class="NavBarItem">Alert History</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="summary-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/summary.cgi" target="main" onMouseOver="switchdot('summary-dot',1)" onMouseOut="switchdot('summary-dot',0)" class="NavBarItem">Alert Summary</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="notifications-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/notifications.cgi?contact=all" target="main" onMouseOver="switchdot('notifications-dot',1)" onMouseOut="switchdot('notifications-dot',0)" class="NavBarItem">Notifications</a></td>
++ </tr>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="logfile-dot"></td>
++ <td nowrap><a href="/nagios/cgi-bin/showlog.cgi" target="main" onMouseOver="switchdot('logfile-dot',1)" onMouseOut="switchdot('logfile-dot',0)" class="NavBarItem">Event Log</a></td>
++ </tr>
++ <tr>
++ <td colspan="2" height="10"></td>
++ </tr>
++</table>
++
++
++<table width="150" border="0">
++ <tr>
++ <td><img src="/nagios/images/sbconfig.png" width="147" height="21" alt="-- Configuration --"></td>
++ </tr>
++</table>
++
++<table width="150" border="0" cellpadding=0 cellspacing=0>
++ <tr>
++ <td width=13><img src="/nagios/images/greendot.gif" width="13" height="14" name="config-dot"></td>
++ <td nowrap width=134><a href="/nagios/cgi-bin/config.cgi" target="main" onMouseOver="switchdot('config-dot',1)" onMouseOut="switchdot('config-dot',0)" class="NavBarItem">View Config</a></td>
++ </tr>
++</table>
++
++</BODY>
++</HTML>
diff -urN orig/nagios-1.3-cvs.20050116/debian/rules new/nagios-1.3-cvs.20050116/debian/rules
--- orig/nagios-1.3-cvs.20050116/debian/rules 2005-01-20 14:47:51.000000000 +0100
+++ new/nagios-1.3-cvs.20050116/debian/rules 2005-01-21 12:46:01.000000000 +0100
@@ -10,7 +10,7 @@
maindir = $(shell pwd)
b = $(shell pwd)/debian
-CGIBINS = avail cmd config extinfo histogram history notifications outages showlog status statusmap statuswml statuswrl summary tac trends
+CGIBINS = avail cmd config extinfo grouplist histogram history notifications outages showlog status statusmap statuswml statuswrl summary tac trends
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
--===============1159670625==--
---------------------------------------
Received: (at 291775-close) by bugs.debian.org; 4 Aug 2005 00:16:00 +0000
>From seanius at seanius.net Wed Aug 03 17:16:00 2005
Return-path: <seanius at seanius.net>
Received: from dsl092-235-113.phl1.dsl.speakeasy.net (sativa.seanius.net) [66.92.235.113]
by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
id 1E0TOx-0001gr-00; Wed, 03 Aug 2005 17:16:00 -0700
Received: by sativa.seanius.net (Postfix, from userid 1000)
id 9649015846; Wed, 3 Aug 2005 20:15:27 -0400 (EDT)
Date: Wed, 3 Aug 2005 20:15:27 -0400
From: sean finney <seanius at debian.org>
To: 291775-close at bugs.debian.org
Subject: closing old bug
Message-ID: <20050804001527.GA17544 at seanius.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="2oS5YaxWCcQjTEyO"
Content-Disposition: inline
User-Agent: Mutt/1.5.5.1+cvs20040105i
Delivered-To: 291775-close at bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no
version=2.60-bugs.debian.org_2005_01_02
--2oS5YaxWCcQjTEyO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
hi,
looks like we forgot to close this bug, even though the fix was in an
uploaded package of nagios... so i'll do that now.
thanks,
sean
--=20
--2oS5YaxWCcQjTEyO
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFC8V4fynjLPm522B0RAlQZAJ9YrG1mxAEeM4DEgiikwfSoxPu58QCfemDv
+s0p4B70Oi5C/ScwazHfLGo=
=efDI
-----END PGP SIGNATURE-----
--2oS5YaxWCcQjTEyO--
More information about the Pkg-nagios-devel
mailing list