[Pkg-nagios-changes] [pkg-nagios] r1947 - nagvis/trunk/debian

[Alexander Reichle-Schmehl]

tags 632333 pending
thanks

Author: tolimar
Date: 2011-09-07 12:30:46 +0000 (Wed, 07 Sep 2011)
New Revision: 1947

Modified:
   nagvis/trunk/debian/apache.conf
   nagvis/trunk/debian/changelog
Log:
Properly set "Options FollowSymLinks" in the apache configuration



Modified: nagvis/trunk/debian/apache.conf
===================================================================
--- nagvis/trunk/debian/apache.conf	2011-09-07 12:26:42 UTC (rev 1946)
+++ nagvis/trunk/debian/apache.conf	2011-09-07 12:30:46 UTC (rev 1947)
@@ -4,13 +4,18 @@
 Alias /nagvis/nagvis/images /var/lib/nagvis/images
 Alias /nagvis /usr/share/nagvis/htdocs
 
+# the FollowSymlinks option is only considere in a directory section, not
+# in a DirectoryMatch section.  Setting it here.
+<Directory /usr/share/nagvis/htdocs>
+    Options FollowSymLinks
+</Directory>
+
 # -- old style
 # Alias /nagios3/nagvis /usr/share/nagvis/htdocs
 
 # -- use basic authentification from nagios3 package
 #    please adapt to your needs
 <DirectoryMatch (/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis)>
-        Options FollowSymLinks
 	DirectoryIndex index.php
 
         Order Allow,Deny

Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2011-09-07 12:26:42 UTC (rev 1946)
+++ nagvis/trunk/debian/changelog	2011-09-07 12:30:46 UTC (rev 1947)
@@ -6,9 +6,11 @@
     * Set urgency to medium due to RC bug fix
   * Set Path to gadget files in example configuration (via
     patches/config.dpatch) (Closes: #611909)
- 
- -- Alexander Reichle-Schmehl <tolimar at debian.org>  Wed, 07 Sep 2011 14:21:29 +0200
+  * Properly set "Options FollowSymLinks" in the apache configuration
+    (Closes: #632333)
 
+ -- Alexander Reichle-Schmehl <tolimar at debian.org>  Wed, 07 Sep 2011 14:29:16 +0200
+
 nagvis (1:1.4.6-1.1) unstable; urgency=low
 
   * Non-maintainer upload.