remove .gitignore in image dirs; symlinks to nagios logos

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

diff --git a/debian/apache.conf b/debian/apache.conf
index 16e5bcb63a03427a6b99b3c4d446758a3719d743..a2933f6ca9df9549c14b143071c13e29684a4628 100644 (file)
--- a/debian/apache.conf
+++ b/debian/apache.conf
@@ -1,12 +1,15 @@
 # -- 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 /usr/share/nagvis/htdocs
 
-# -- backward compatibility
-Alias /nagios3/nagvis /usr/share/nagvis/htdocs
+# -- 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>
+<DirectoryMatch (/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis)>
         Options FollowSymLinks
        DirectoryIndex index.php
 
@@ -17,4 +20,4 @@ Alias /nagios3/nagvis /usr/share/nagvis/htdocs
         AuthType Basic
         AuthUserFile /etc/nagios3/htpasswd.users
        require valid-user
-</Directory>
+</DirectoryMatch>