[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-1-12-ga58845a

[Markus Frosch]

The following commit has been merged in the master branch:
commit a58845a6912bb56919130b26e16fdcf518467699
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Thu Jun 28 13:07:23 2012 +0200

    included htaccess stuff into apache2.conf and some further tuning

diff --git a/debian/apache2.conf b/debian/apache2.conf
index e9124eb..183a3d5 100644
--- a/debian/apache2.conf
+++ b/debian/apache2.conf
@@ -11,26 +11,80 @@ Alias /icinga-web/js/ext3 /usr/share/icinga-web/lib/ext3
 Alias /icinga-web /usr/share/icinga-web/pub
 
 <DirectoryMatch /usr/share/icinga-web/app/modules/\w+/pub/styles/>
-        Order allow,deny
-        Allow from all
+    Order allow,deny
+    Allow from all
 </DirectoryMatch>
 
 <DirectoryMatch /usr/share/icinga-web/app/modules/\w+/pub/images/>
-        Order allow,deny
-        Allow from all
+    Order allow,deny
+    Allow from all
 </DirectoryMatch>
 
 
 <Directory /usr/share/icinga-web/lib/ext3>
-        Order allow,deny
-        Allow from all
+    Order allow,deny
+    Allow from all
+    Options -Indexes -MultiViews
 </Directory>
 
 <Directory /usr/share/icinga-web/pub>
-        DirectoryIndex index.php
-        Options FollowSymLinks
-        AllowOverride all
-        Order allow,deny
-        Allow from all
+    DirectoryIndex index.php
+    Options -MultiViews -Indexes +FollowSymLinks
+    AllowOverride all
+    Order allow,deny
+    Allow from all
+    
+    RewriteEngine On
+    # /icinga-web is base for all rewrite rules
+    RewriteBase /icinga-web
+    
+    # If the requested URL does not exist (it's likely an agavi route),
+    # pass it as path info to index.php, the Agavi dispatch script.
+    RewriteRule ^$ index.php?/ [QSA,L]
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule (.*) index.php?/$1 [QSA,L]
+    
+    <IfModule mod_deflate.c>
+        # Insert filter
+        SetOutputFilter DEFLATE
+        
+        # Netscape 4.x has some problems...
+        BrowserMatch ^Mozilla/4 gzip-only-text/html
+        
+        # Netscape 4.06-4.08 have some more problems
+        BrowserMatch ^Mozilla/4\.0[678] no-gzip
+        
+        # MSIE masquerades as Netscape, but it is fine
+        BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+        # Don't compress images
+        SetEnvIfNoCase Request_URI \
+        \.(?:gif|jpe?g|png)$ no-gzip dont-vary
+        
+        # Make sure proxies don't deliver the wrong content
+        <IfModule mod_headers.c>
+            Header append Vary User-Agent env=!dont-vary
+        </IfModule>
+    </IfModule>
+
+    <IfDefine APACHE2>
+        AcceptPathInfo On
+    </IfDefine>
+
+</Directory>
+
+<Directory /usr/share/icinga-web/pub/soap>
+    RewriteEngine On
+    
+    # This depends on your path
+    # on independent hosts the base is '/'
+    RewriteBase /icinga-web/soap
+	
+	# If the requested URL does not exist (it's likely an agavi route),
+	# pass it as path info to index.php, the Agavi dispatch script.
+	RewriteRule ^$ index.php?/ [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule (.*) index.php?/$1 [QSA,L]
 </Directory>
 
diff --git a/debian/icinga-web.install b/debian/icinga-web.install
index a7d16b8..560db0c 100644
--- a/debian/icinga-web.install
+++ b/debian/icinga-web.install
@@ -15,5 +15,5 @@ usr/lib/ext3 usr/share/icinga-web/lib
 usr/lib/jit usr/share/icinga-web/lib
 usr/lib/jsgettext usr/share/icinga-web/lib
 usr/lib/phpseclib usr/share/icinga-web/lib
-usr/pub/* usr/share/icinga-web/pub
-usr/pub/.htaccess usr/share/icinga-web/pub
+usr/pub/index.php usr/pub/api/ usr/pub/images/ usr/pub/styles/ usr/share/icinga-web/pub
+usr/pub/soap/* usr/share/icinga-web/pub/soap

-- 
Debian packaging of icinga-web