From: tolimar <tolimar@98d490a6-b407-0410-aaaa-fdee166ba3f5>
Date: Wed, 7 Sep 2011 12:30:46 +0000 (+0000)
Subject: Properly set "Options FollowSymLinks" in the apache configuration
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=75d9bb11285fe36d87d5ea1581a3b43d6054cd32;p=pkg-nagvis.git

Properly set "Options FollowSymLinks" in the apache configuration



git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1947 98d490a6-b407-0410-aaaa-fdee166ba3f5
---

diff --git a/debian/apache.conf b/debian/apache.conf
index a2933f6..cc7cd5e 100644
--- a/debian/apache.conf
+++ b/debian/apache.conf
@@ -4,13 +4,18 @@ Alias /nagvis/nagvis/gadgets /etc/nagvis/gadgets
 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
diff --git a/debian/changelog b/debian/changelog
index 1202135..cd12c25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ nagvis (1:1.4.6-2) UNRELEASED; urgency=medium
     * 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@debian.org>  Wed, 07 Sep 2011 14:21:29 +0200
+  * Properly set "Options FollowSymLinks" in the apache configuration
+    (Closes: #632333)
+
+ -- Alexander Reichle-Schmehl <tolimar@debian.org>  Wed, 07 Sep 2011 14:29:16 +0200
 
 nagvis (1:1.4.6-1.1) unstable; urgency=low