[Pkg-nagios-devel] Bug#291775: any progress on this?

Filip Sneppe Filip Sneppe <filip.sneppe@uptime.be>, 291775@bugs.debian.org
Fri, 15 Apr 2005 16:27:10 +0200


--=-G4uFgK6SuX7IclV90G3S
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Sat, 2005-04-02 at 19:12 -0500, sean finney wrote:
> hi filip,
> 
> any progress on the side.cgi patch?
> 
Sorry, I hadn't given this any of my attention lately...

How does the attached patch look ?

Regards,
Filip

--=-G4uFgK6SuX7IclV90G3S
Content-Disposition: attachment; filename=diff.nagios.grouplist.patch-20050415-05.final
Content-Type: text/x-patch; name=diff.nagios.grouplist.patch-20050415-05.final; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit

diff -urN orig/nagios-1.3-cvs.20050402/debian/apache.conf finalmod/nagios-1.3-cvs.20050402/debian/apache.conf
--- orig/nagios-1.3-cvs.20050402/debian/apache.conf	2005-04-14 10:35:45.000000000 +0200
+++ finalmod/nagios-1.3-cvs.20050402/debian/apache.conf	2005-04-15 14:51:34.000000000 +0200
@@ -26,6 +26,12 @@
 # Where the stylesheets (config files) reside
 Alias /nagios/stylesheets /etc/nagios/stylesheets
 
+# Enable this ScriptAlias if you want to enable the grouplist patch.
+# See http://apan.sourceforge.net/download.html for more info
+# It allows you to see a clickable list of all hostgroups in the
+# left pane of the Nagios web interface
+#ScriptAlias /nagios/side.html /usr/lib/cgi-bin/nagios/grouplist.cgi
+
 # Where the HTML pages live(d)
 Alias /netsaint /usr/share/nagios/htdocs
 Alias /nagios /usr/share/nagios/htdocs
diff -urN orig/nagios-1.3-cvs.20050402/debian/patches/00list finalmod/nagios-1.3-cvs.20050402/debian/patches/00list
--- orig/nagios-1.3-cvs.20050402/debian/patches/00list	2005-04-14 10:35:45.000000000 +0200
+++ finalmod/nagios-1.3-cvs.20050402/debian/patches/00list	2005-04-15 14:51:34.000000000 +0200
@@ -6,5 +6,6 @@
 06_makefile.in_delete_defaults.dpatch
 07_fix_default_config.dpatch
 08_side.html_absolute_url_fix.dpatch
+09_use_grouplists.dpatch
 9999_nsca_pathfix.dpatch
 10000_no-password-disclosure.dpatch
diff -urN orig/nagios-1.3-cvs.20050402/debian/patches/09_use_grouplists.dpatch finalmod/nagios-1.3-cvs.20050402/debian/patches/09_use_grouplists.dpatch
--- orig/nagios-1.3-cvs.20050402/debian/patches/09_use_grouplists.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ finalmod/nagios-1.3-cvs.20050402/debian/patches/09_use_grouplists.dpatch	2005-04-15 14:50:59.000000000 +0200
@@ -0,0 +1,366 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_use_grouplists.dpatch by Filip Sneppe <filip.sneppe@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
+
+@DPATCH@
+diff -urN nagios-1.3-cvs.20050402/cgi/Makefile.in nagios-1.3-cvs.20050402/cgi/Makefile.in
+--- nagios-1.3-cvs.20050402/cgi/Makefile.in	2005-04-06 07:24:44.000000000 +0200
++++ nagios-1.3-cvs.20050402/cgi/Makefile.in	2005-04-15 10:41:26.000000000 +0200
+@@ -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.20050402/cgi/grouplist.cgi.in nagios-1.3-cvs.20050402/cgi/grouplist.cgi.in
+--- nagios-1.3-cvs.20050402/cgi/grouplist.cgi.in	1970-01-01 01:00:00.000000000 +0100
++++ nagios-1.3-cvs.20050402/cgi/grouplist.cgi.in	2005-04-15 10:41:26.000000000 +0200
+@@ -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.20050402/configure.in nagios-1.3-cvs.20050402/configure.in
+--- nagios-1.3-cvs.20050402/configure.in	2004-10-25 04:32:13.000000000 +0200
++++ nagios-1.3-cvs.20050402/configure.in	2005-04-15 10:41:26.000000000 +0200
+@@ -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/side.html html/side1.html html/side2.html)
+ 
+ 
+ perl subst common/locations.h
+diff -urN nagios-1.3-cvs.20050402/html/Makefile.in nagios-1.3-cvs.20050402/html/Makefile.in
+--- nagios-1.3-cvs.20050402/html/Makefile.in	2002-03-01 02:46:43.000000000 +0100
++++ nagios-1.3-cvs.20050402/html/Makefile.in	2005-04-15 10:41:26.000000000 +0200
+@@ -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 side.html side1.html side2.html
+ 
+ distclean: clean
+ 
+diff -urN nagios-1.3-cvs.20050402/configure nagios-1.3-cvs.20050402-new/configure
+--- nagios-1.3-cvs.20050402/configure	2004-10-25 04:32:13.000000000 +0200
++++ nagios-1.3-cvs.20050402-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/side.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.20050402/html/side1.html.in nagios-1.3-cvs.20050402/html/side1.html.in
+--- nagios-1.3-cvs.20050402/html/side1.html.in	1970-01-01 01:00:00.000000000 +0100
++++ nagios-1.3-cvs.20050402/html/side1.html.in	2005-04-15 10:41:26.000000000 +0200
+@@ -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.20050402/html/side2.html.in nagios-1.3-cvs.20050402/html/side2.html.in
+--- nagios-1.3-cvs.20050402/html/side2.html.in	1970-01-01 01:00:00.000000000 +0100
++++ nagios-1.3-cvs.20050402/html/side2.html.in	2005-04-15 10:41:26.000000000 +0200
+@@ -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.20050402/debian/rules finalmod/nagios-1.3-cvs.20050402/debian/rules
--- orig/nagios-1.3-cvs.20050402/debian/rules	2005-04-14 10:35:45.000000000 +0200
+++ finalmod/nagios-1.3-cvs.20050402/debian/rules	2005-04-15 14:51:34.000000000 +0200
@@ -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)

--=-G4uFgK6SuX7IclV90G3S--