[Inteproxy-commits] r244 - trunk/server/conf

[scm-commit@wald.intevation.org]

Author: bjoern
Date: 2010-03-19 14:17:34 +0100 (Fri, 19 Mar 2010)
New Revision: 244

Added:
   trunk/server/conf/platform-standalone-debian.conf
Modified:
   trunk/server/conf/httpd.conf
   trunk/server/conf/platform-debian.conf
Log:
Change configuration files, to avoid conflicts between the standalone apache
configuration file and the debian apache configuration file.


Modified: trunk/server/conf/httpd.conf
===================================================================
--- trunk/server/conf/httpd.conf	2010-03-19 13:11:16 UTC (rev 243)
+++ trunk/server/conf/httpd.conf	2010-03-19 13:17:34 UTC (rev 244)
@@ -10,7 +10,7 @@
 #    proxy
 #    proxy_http
 #    ssl
-Include conf/platform-debian.conf
+Include conf/platform-standalone-debian.conf
 
 # InteProxy typically listens only on localhost port 64609
 Listen 127.0.0.1:64609

Modified: trunk/server/conf/platform-debian.conf
===================================================================
--- trunk/server/conf/platform-debian.conf	2010-03-19 13:11:16 UTC (rev 243)
+++ trunk/server/conf/platform-debian.conf	2010-03-19 13:17:34 UTC (rev 244)
@@ -1,8 +1,5 @@
 # debian specific configuration
 
-User www-data
-Group www-data
-
 Include /etc/apache2/mods-available/rewrite.load
 Include /etc/apache2/mods-available/authz_host.load
 Include /etc/apache2/mods-available/proxy.load

Added: trunk/server/conf/platform-standalone-debian.conf
===================================================================
--- trunk/server/conf/platform-standalone-debian.conf	2010-03-19 13:11:16 UTC (rev 243)
+++ trunk/server/conf/platform-standalone-debian.conf	2010-03-19 13:17:34 UTC (rev 244)
@@ -0,0 +1,10 @@
+# debian specific configuration
+
+User www-data
+Group www-data
+
+Include /etc/apache2/mods-available/rewrite.load
+Include /etc/apache2/mods-available/authz_host.load
+Include /etc/apache2/mods-available/proxy.load
+Include /etc/apache2/mods-available/proxy_http.load
+Include /etc/apache2/mods-available/ssl.load