[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-4-14-g1c7099f

[Markus Frosch]

The following commit has been merged in the master branch:
commit acc4449e11cb3e2246abd6c6e4ab72777979c8f7
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Jul 2 14:43:28 2012 +0200

    optimized apache2.conf - some regexp stuff, cleanup and comments

diff --git a/debian/apache2.conf b/debian/apache2.conf
index 183a3d5..194b516 100644
--- a/debian/apache2.conf
+++ b/debian/apache2.conf
@@ -1,36 +1,49 @@
+####
+# Icinga Web Apache configuration
 #
-# icinga-web apache configuration
-# - Enable all options .htaccess
-# - Add extjs library to alias
+# this is a derived config file for the
+# icinga-web Debian package
 #
-AliasMatch /icinga-web/modules/([A-Za-z0-9]*)/resources/styles/([A-Za-z0-9]*\.css)$ /usr/share/icinga-web/app/modules/$1/pub/styles/$2
-AliasMatch /icinga-web/modules/([A-Za-z0-9]*)/resources/images/([A-Za-z_\-0-9]*\.(png|gif|jpg))$ /usr/share/icinga-web/app/modules/$1/pub/images/$2
+# No .htaccess file is needed under
+# the application.
+# 
+# -Markus Frosch <markus at lazyfrosch.de>
+###
 
+# Matching for module stylesheet and images
+AliasMatch "^/icinga-web/modules/([A-Za-z0-9]+)/resources/styles/([A-Za-z0-9]+\.css)$" "/usr/share/icinga-web/app/modules/$1/pub/styles/$2"
+AliasMatch "^/icinga-web/modules/([A-Za-z0-9]+)/resources/images/([A-Za-z_\-0-9]+\.(?:png|gif|jpg))$" "/usr/share/icinga-web/app/modules/$1/pub/images/$2"
 
-Alias /icinga-web/js/ext3 /usr/share/icinga-web/lib/ext3
-Alias /icinga-web /usr/share/icinga-web/pub
+# Matching for Icinga Web and the ext3 framework
+Alias /icinga-web/js/ext3/ /usr/share/icinga-web/lib/ext3/
+Alias /icinga-web/ /usr/share/icinga-web/pub/
+RedirectMatch "^/icinga-web$" /icinga-web/
 
-<DirectoryMatch /usr/share/icinga-web/app/modules/\w+/pub/styles/>
+# Access to where the styles are located
+<DirectoryMatch "^/usr/share/icinga-web/app/modules/\w+/pub/styles/">
+    Options -Indexes -MultiViews
     Order allow,deny
     Allow from all
 </DirectoryMatch>
 
-<DirectoryMatch /usr/share/icinga-web/app/modules/\w+/pub/images/>
+# Access to where the images are located
+<DirectoryMatch "^/usr/share/icinga-web/app/modules/\w+/pub/images/">
+    Options -Indexes -MultiViews
     Order allow,deny
     Allow from all
 </DirectoryMatch>
 
-
-<Directory /usr/share/icinga-web/lib/ext3>
+# Access to the ext3 library
+<Directory "/usr/share/icinga-web/lib/ext3/">
+    Options -Indexes -MultiViews
     Order allow,deny
     Allow from all
-    Options -Indexes -MultiViews
 </Directory>
 
-<Directory /usr/share/icinga-web/pub>
+# Access to the public web folder of Icinga Web
+<Directory "/usr/share/icinga-web/pub/">
     DirectoryIndex index.php
     Options -MultiViews -Indexes +FollowSymLinks
-    AllowOverride all
     Order allow,deny
     Allow from all
     
@@ -70,10 +83,10 @@ Alias /icinga-web /usr/share/icinga-web/pub
     <IfDefine APACHE2>
         AcceptPathInfo On
     </IfDefine>
-
 </Directory>
 
-<Directory /usr/share/icinga-web/pub/soap>
+# rewrite rules for the soap interface
+<Directory "/usr/share/icinga-web/pub/soap/">
     RewriteEngine On
     
     # This depends on your path

-- 
Debian packaging of icinga-web