[Inteproxy-commits] r310 - in trunk: . server/conf

[scm-commit@wald.intevation.org]

Author: bjoern
Date: 2011-06-15 15:18:53 +0200 (Wed, 15 Jun 2011)
New Revision: 310

Modified:
   trunk/ChangeLog
   trunk/server/conf/platform-WindowsServer2003.conf
   trunk/server/conf/platform-debian.conf
   trunk/server/conf/platform-suse.conf
Log:
Adjusted platform depend config files. Added missing modules. Avoided loading of already loaded modules.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-06-15 12:25:04 UTC (rev 309)
+++ trunk/ChangeLog	2011-06-15 13:18:53 UTC (rev 310)
@@ -1,5 +1,13 @@
 2011-06-15  Bjoern Schilberg <bjoern.schilberg at intevation.de>
 
+	* M server/conf/platform-suse.conf,
+	  M server/conf/platform-debian.conf,
+	  M server/conf/platform-WindowsServer2003.conf:
+	  Added missing modules. Avoided loading of already loaded modules with the
+	  help of the <IfModule> Directive.
+
+2011-06-15  Bjoern Schilberg <bjoern.schilberg at intevation.de>
+
 	* M server/doc/source/konfigurationsdateiVirtualHost.rst:
 	  Highlited important text passage. Adjust syntax higlighting.
 

Modified: trunk/server/conf/platform-WindowsServer2003.conf
===================================================================
--- trunk/server/conf/platform-WindowsServer2003.conf	2011-06-15 12:25:04 UTC (rev 309)
+++ trunk/server/conf/platform-WindowsServer2003.conf	2011-06-15 13:18:53 UTC (rev 310)
@@ -1,10 +1,26 @@
 ## windows 2003 specific configuration
-## apache 2.0.59
+
+<IfModule !authz_host_module>
+LoadModule authz_host_module modules/mod_authz_host.so
+</IfModule>
+<IfModule !deflate_module>
+LoadModule deflate_module modules/mod_deflate.so
+</IfModule>
+<IfModule !filter_module>
+LoadModule filter_module modules/mod_filter.so
+</IfModule>
+<IfModule !proxy_http_module>
+LoadModule proxy_http_module modules/mod_proxy_http.so
+</IfModule>
+<IfModule !proxy_module>
+LoadModule proxy_module modules/mod_proxy.so
+</IfModule>
+<IfModule !rewrite_module>
 LoadModule rewrite_module modules/mod_rewrite.so
-## authz_host-Modul erst ab version 2.1 verfuegbar
-#LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
+</IfModule>
+<IfModule !ssl_module>
 LoadModule ssl_module modules/mod_ssl.so
-LoadModule filter_module modules/mod_filter.so
+</IfModule>
+<IfModule !substitute_module>
 LoadModule substitute_module modules/mod_substitute.so
+</IfModule>

Modified: trunk/server/conf/platform-debian.conf
===================================================================
--- trunk/server/conf/platform-debian.conf	2011-06-15 12:25:04 UTC (rev 309)
+++ trunk/server/conf/platform-debian.conf	2011-06-15 13:18:53 UTC (rev 310)
@@ -1,7 +1,26 @@
 # debian specific configuration
 
-Include /etc/apache2/mods-available/rewrite.load
+<IfModule !authz_host_module>
 Include /etc/apache2/mods-available/authz_host.load
+</IfModule>
+<IfModule !deflate_module>
+Include /etc/apache2/mods-available/deflate.load
+</IfModule>
+<IfModule !filter_module>
+Include /etc/apache2/mods-available/filter.load
+</IfModule>
+<IfModule !proxy_http_module>
+Include /etc/apache2/mods-available/proxy_http.load
+</IfModule>
+<IfModule !proxy_module>
 Include /etc/apache2/mods-available/proxy.load
-Include /etc/apache2/mods-available/proxy_http.load
+</IfModule>
+<IfModule !rewrite_module>
+Include /etc/apache2/mods-available/rewrite.load
+</IfModule>
+<IfModule !ssl_module>
 Include /etc/apache2/mods-available/ssl.load
+</IfModule>
+<IfModule !substitute_module>
+Include /etc/apache2/mods-available/substitute.load
+</IfModule>

Modified: trunk/server/conf/platform-suse.conf
===================================================================
--- trunk/server/conf/platform-suse.conf	2011-06-15 12:25:04 UTC (rev 309)
+++ trunk/server/conf/platform-suse.conf	2011-06-15 13:18:53 UTC (rev 310)
@@ -2,14 +2,28 @@
 #
 # Depending on your apache installation, change the apache2 suffix to prefork,
 # itk or worker. 
-#
-# Comment unneeded or duplicate apache modules.
 
-LoadModule rewrite_module                  /usr/lib/apache2-prefork/mod_rewrite.so
-LoadModule filter_module                   /usr/lib/apache2-prefork/mod_filter.so
-LoadModule substitute_module               /usr/lib/apache2-prefork/mod_substitute.so
-
+<IfModule !authz_default_module>
 LoadModule authz_host_module              /usr/lib/apache2-prefork/mod_authz_host.so
+</IfModule>
+<IfModule !deflate_module>
+LoadModule deflate_module                 /usr/lib/apache2-prefork/mod_deflate.so
+</IfModule>
+<IfModule !filter_module>
+LoadModule filter_module                  /usr/lib/apache2-prefork/mod_filter.so
+</IfModule>
+<IfModule !proxy_http_module>
+LoadModule proxy_http_module              /usr/lib/apache2-prefork/mod_proxy_http.so
+</IfModule>
+<IfModule !proxy_module>
 LoadModule proxy_module                   /usr/lib/apache2-prefork/mod_proxy.so
-LoadModule proxy_http_module              /usr/lib/apache2-prefork/mod_proxy_http.so
+</IfModule>
+<IfModule !rewrite_module>
+LoadModule rewrite_module                 /usr/lib/apache2-prefork/mod_rewrite.so
+</IfModule>
+<IfModule !ssl_module>
 LoadModule ssl_module                     /usr/lib/apache2-prefork/mod_ssl.so
+</IfModule>
+<IfModule !substitute_module>
+LoadModule substitute_module              /usr/lib/apache2-prefork/mod_substitute.so
+</IfModule>