[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-2-7-gc76305d

[Markus Frosch]

The following commit has been merged in the master branch:
commit d58a697c7f6c330a09044ae48f529cf386727ec9
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Jul 30 10:11:11 2012 +0200

    Revert "optimized apache2.conf - some regexp stuff, cleanup and comments"
    
    Removing this change from the wheezy release
    
    This reverts commit ef153ccc1c0d08f86394399fad69d68944b34af6.

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

-- 
Debian packaging of icinga-web