Allow access to installed documentation

[pkg-nagvis.git] / debian / apache.conf

diff --git a/debian/apache.conf b/debian/apache.conf
index 16e5bcb63a03427a6b99b3c4d446758a3719d743..8c1b32cea19fd849efe5686360bb02d4e4b945ea 100644 (file)
--- a/debian/apache.conf
+++ b/debian/apache.conf
@@ -1,13 +1,22 @@
 # -- new style
+Alias /nagvis/nagvis/templates /etc/nagvis/templates
+Alias /nagvis/nagvis/gadgets /etc/nagvis/gadgets
+Alias /nagvis/nagvis/images /var/lib/nagvis/images
+Alias /nagvis/docs /usr/share/doc/nagvis/docs
 Alias /nagvis /usr/share/nagvis/htdocs
 
-# -- backward compatibility
-Alias /nagios3/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
-<Directory /usr/share/nagvis/htdocs>
-        Options FollowSymLinks
+<DirectoryMatch (/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis|/usr/share/doc/nagvis/docs)>
        DirectoryIndex index.php
 
         Order Allow,Deny
@@ -17,4 +26,4 @@ Alias /nagios3/nagvis /usr/share/nagvis/htdocs
         AuthType Basic
         AuthUserFile /etc/nagios3/htpasswd.users
        require valid-user
-</Directory>
+</DirectoryMatch>