[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.8.3-1-32-g1d1a585

[Markus Frosch]

The following commit has been merged in the master branch:
commit 435cae2396c17fadf2688bc06f0e27ecd2ef4ed5
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon May 6 08:47:57 2013 +0200

    switched to Apache2 configuration coming from upstream

diff --git a/debian/apache2.conf b/debian/apache2.conf
deleted file mode 100644
index 0960db6..0000000
--- a/debian/apache2.conf
+++ /dev/null
@@ -1,96 +0,0 @@
-####
-# Icinga Web Apache configuration
-#
-# this is a derived config file for the
-# icinga-web Debian package
-#
-# 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"
-
-# Allow access to the docs via icinga-web
-Alias /icinga-web/docs/ /usr/share/icinga/htdocs/docs/
-# 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/
-
-# 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>
-
-# 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>
-
-# Access to the ext3 library
-<Directory "/usr/share/icinga-web/lib/ext3/">
-    Options -Indexes -MultiViews
-    Order allow,deny
-    Allow from all
-</Directory>
-
-# Access to the docs (via icinga-doc)
-<DirectoryMatch "/usr/share/icinga/htdocs/docs/">
-    DirectoryIndex index.html
-    Order Allow,Deny
-    Allow From All
-</DirectoryMatch>
-
-# Access to the public web folder of Icinga Web
-<Directory "/usr/share/icinga-web/pub/">
-    DirectoryIndex index.php
-    Options -MultiViews -Indexes +FollowSymLinks
-    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?/$0 [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>
-
diff --git a/debian/icinga-web.install b/debian/icinga-web.install
index 210feb3..cb49e58 100644
--- a/debian/icinga-web.install
+++ b/debian/icinga-web.install
@@ -1,4 +1,4 @@
-debian/apache2.conf /etc/icinga-web
+etc/apache2/icinga-web.conf etc/icinga-web
 etc/icinga-web/conf.d/* etc/icinga-web/conf.d
 debian/database-ido.xml.tmpl usr/share/icinga-web/tmpl
 debian/database-web.xml.tmpl usr/share/icinga-web/tmpl
diff --git a/debian/rules b/debian/rules
index 4973f38..3ddaab3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,8 @@ override_dh_install:
 	cp etc/schema/updates/pgsql/pgsql_v1-8-0_to_v-1-8-1.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/upgrade/pgsql/1.8.1~schema0
 	cp etc/schema/updates/pgsql/pgsql_v1-8-1_to_v1-8-3.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/upgrade/pgsql/1.8.3~schema0
 	cp etc/schema/updates/pgsql/pgsql_v1-8-3_to_v1-9.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/upgrade/pgsql/1.9.0~0schema
+	# rename apache config file
+	mv ${b}/icinga-web/etc/icinga-web/icinga-web.conf ${b}/icinga-web/etc/icinga-web/apache2.conf
 	###
 	# PNP
 	###

-- 
Debian packaging of icinga-web