[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-2-27-g3dbb875

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 3263424a5f2733921fde7fd1abf3c0a5ddaca2e6
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri May 4 07:57:15 2012 +0200

    improve apache configuration
    
    Closes: #659896
    Thanks: Christoph Anton Mitterer for the patch

diff --git a/debian/apache2.conf b/debian/apache2.conf
index 4764cde..539fb7a 100644
--- a/debian/apache2.conf
+++ b/debian/apache2.conf
@@ -1,7 +1,6 @@
 # apache configuration for icinga
 
 ScriptAlias /cgi-bin/icinga /usr/lib/cgi-bin/icinga
-ScriptAlias /icinga/cgi-bin /usr/lib/cgi-bin/icinga
 
 # Where the stylesheets (config files) reside
 Alias /icinga/stylesheets /etc/icinga/stylesheets
@@ -9,7 +8,7 @@ Alias /icinga/stylesheets /etc/icinga/stylesheets
 # Where the HTML pages live
 Alias /icinga /usr/share/icinga/htdocs
 
-<DirectoryMatch (/usr/share/icinga/htdocs|/usr/lib/cgi-bin/icinga|/etc/icinga/stylesheets)>
+<DirectoryMatch "^(/usr/share/icinga/htdocs|/usr/lib/cgi-bin/icinga|/etc/icinga/stylesheets)">
 	Options FollowSymLinks
 
 	DirectoryIndex index.html
@@ -21,5 +20,5 @@ Alias /icinga /usr/share/icinga/htdocs
 	AuthName "Icinga Access"
 	AuthType Basic
 	AuthUserFile /etc/icinga/htpasswd.users
-	require valid-user
+	Require valid-user
 </DirectoryMatch>

-- 
debian packaging of icinga(-core)