[Pkg-nagios-devel] nagios apache.conf,1.1.1.1,1.2 changelog,1.52,1.53 nagios-common.dirs,1.4,1.5 rules,1.15,1.16
seanius@haydn.debian.org
seanius@haydn.debian.org
Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv29242
Modified Files:
apache.conf changelog nagios-common.dirs rules
Log Message:
changelog comment for the dh reordering i did a week ago (which by now
has been reported as a bug) as well as a modified version of filip's
grouplist patch.
Index: apache.conf
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/apache.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- apache.conf 31 Oct 2004 09:59:28 -0000 1.1.1.1
+++ apache.conf 16 Apr 2005 04:59:41 -0000 1.2
@@ -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
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- changelog 5 Apr 2005 04:47:49 -0000 1.52
+++ changelog 16 Apr 2005 04:59:41 -0000 1.53
@@ -1,5 +1,19 @@
+nagios (2:1.3-cvs.20050402-2) unstable; urgency=low
+
+ * Sean Finney:
+ - change the order of a couple debhelper macros that resulted in
+ nagios not being stopped at purge time. thanks to
+ Filip Sneppe <filip.sneppe@uptime.be> for reporting this
+ (closes: #304796).
+ - include the "grouplist.cgi" patch from apan.sourceforge.net, as
+ well as a commented out example in apache.conf to use it.
+ thanks to Filip for doing the gruntwork on this.
+
+ -- sean finney <seanius@debian.org> Sat, 16 Apr 2005 00:50:30 -0400
+
nagios (2:1.3-cvs.20050402-1) unstable; urgency=low
+ * Sean Finney:
- new upstream cvs snapshot (bugfixes and doc updates only).
- somehow nagios got packaged as a debian-native package. oops.
thanks to Stephen Gran <sgran@debian.org> for pointing out
Index: nagios-common.dirs
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.dirs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nagios-common.dirs 23 Feb 2005 00:27:20 -0000 1.4
+++ nagios-common.dirs 16 Apr 2005 04:59:41 -0000 1.5
@@ -3,6 +3,7 @@
etc/nagios/stylesheets
usr/sbin
usr/lib/nagios/plugins/eventhandlers
+usr/lib/cgi-bin/nagios
usr/share/nagios/pluginconfig
var/log/nagios/archives
var/run/nagios
Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- rules 6 Apr 2005 05:23:55 -0000 1.15
+++ rules 16 Apr 2005 04:59:41 -0000 1.16
@@ -199,7 +199,7 @@
dh_md5sums -p$@ -P$(b)/$@
dh_builddeb -p$@ -P$(b)/$@
-nagios-common:
+nagios-common: patch
@echo "--- Building: $@"
dh_installdirs -p$@ -P$(b)/$@
dh_installdocs -p$@ -P$(b)/$@
@@ -208,6 +208,7 @@
rm -f $$file; \
done; \
)
+ install -m 755 cgi/grouplist.cgi.in debian/$@/usr/lib/cgi-bin/nagios/grouplist.cgi
dh_installchangelogs -p$@ -P$(b)/$@ Changelog
dh_installinit -p$@ -P$(b)/$@ --name nagios -- defaults 30
dh_install -p$@ -P$(b)/$@