[Pkg-nagios-devel] nagios apache.conf,1.3,1.4 changelog,1.72,1.73

[seanius at haydn.debian.org]

Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv17400

Modified Files:
	apache.conf changelog 
Log Message:
scriptaliases readded for netsaint installs

Index: apache.conf
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/apache.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apache.conf	4 Jul 2005 16:46:33 -0000	1.3
+++ apache.conf	29 Aug 2005 17:04:23 -0000	1.4
@@ -1,15 +1,16 @@
 # BEGIN FOR NAGIOS
-# Bug 160681 and 162986 say that the ScriptAlias should be
-#	/cgi-bin/nagios
-# but some reports, 164925, (and the default config) say
-# that it should be
-#	/nagios/cgi-bin
-# Anyone having problems with this, PLEASE dig deeper in WHY
-# it won't work for you...
-#
-# I'm enabling BOTH, just to be sure!
+
+# nagios is ScriptAlias'd to answer both as /cgi-bin/nagios and
+# /nagios/cgi-bin, which should make things work in both standard
+# and "virtualhost" style installs.
 ScriptAlias /cgi-bin/nagios /usr/lib/cgi-bin/nagios
 ScriptAlias /nagios/cgi-bin /usr/lib/cgi-bin/nagios
+# the following are from the heady days of netsaint.  if you have
+# users who refuse to update their bookmarks, uncomment the next two
+# lines.
+#ScriptAlias /cgi-bin/netsaint /usr/lib/cgi-bin/nagios
+#ScriptAlias /netsaint/cgi-bin /usr/lib/cgi-bin/nagios
+
 <DirectoryMatch /usr/lib/cgi-bin/nagios>
 	Options ExecCGI
 
@@ -32,7 +33,7 @@
 # left pane of the Nagios web interface
 #ScriptAlias /nagios/side.html /usr/lib/cgi-bin/nagios/grouplist.cgi
 
-# Where the HTML pages live(d)
+# Where the HTML pages live
 Alias /nagios /usr/share/nagios/htdocs
 <DirectoryMatch /usr/share/nagios/htdocs>
 	Options FollowSymLinks

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- changelog	29 Aug 2005 16:32:51 -0000	1.72
+++ changelog	29 Aug 2005 17:04:23 -0000	1.73
@@ -9,8 +9,11 @@
       result in massively large logs as nagios spins its wheels.  thanks
       to Andres Salomon and Don Armstrong and Steve Langasek for their
       feedback and suggested patches (closes: #311695).
+    - re-added (commented out) ScriptAliases for the old netsaint
+      locations, for folks who still have bookmarks :)  thanks to
+      Mathew Rubright for mentioning this (closes: #317015).
 
- -- sean finney <seanius at debian.org>  Mon, 29 Aug 2005 12:32:16 -0400
+ -- sean finney <seanius at debian.org>  Mon, 29 Aug 2005 13:03:56 -0400
 
 nagios (2:1.3-cvs.20050402-5) unstable; urgency=low