# HG changeset patch
# User Bjoern Schilberg <bjoern@intevation.de>
# Date 1299247048 -3600
# Node ID d6a660a3f70d1959aefd472b29c3a17712db505d
# Parent  3d7c86dbc65cb0cec97a66d45447bf76fa26755e
Apache adjustments for the mxd-testbed.

diff -r 3d7c86dbc65c -r d6a660a3f70d ChangeLog
--- a/ChangeLog	Fri Mar 04 14:53:53 2011 +0100
+++ b/ChangeLog	Fri Mar 04 14:57:28 2011 +0100
@@ -1,3 +1,10 @@
+2011-03-04  Bjoern Schilberg  <bjoern.schilberg@intevation.de>
+
+	* M contrib/apache/mxd-testbed.conf:
+	  Adjustment for the mxd-testbed.
+	* M contrib/sh/wms_mxd.cgi:
+	  chmod 755
+
 2011-03-03  Bjoern Schilberg  <bjoern.schilberg@intevation.de>
 
 	* M README.txt:
diff -r 3d7c86dbc65c -r d6a660a3f70d contrib/apache/mxd-testbed.conf
--- a/contrib/apache/mxd-testbed.conf	Fri Mar 04 14:53:53 2011 +0100
+++ b/contrib/apache/mxd-testbed.conf	Fri Mar 04 14:57:28 2011 +0100
@@ -19,11 +19,11 @@
     # DocumentRoot: The directory out of which you will serve your
     # documents. By default, all requests are taken from this directory, but
     # symbolic links and aliases may be used to point to other locations.
-    DocumentRoot /srv/www/vhosts/dummy-host.example.com
+    DocumentRoot /home/intevation/mxd-testbed/web
 
     # if not specified, the global error log is used
-    ErrorLog /var/log/apache2/dummy-host.example.com-error_log
-    CustomLog /var/log/apache2/dummy-host.example.com-access_log combined
+    ErrorLog /var/log/apache2/mxd-testbed_error.log
+    CustomLog /var/log/apache2/mxd-testbed_access.log combined
 
     # don't loose time with IP address lookups
     HostnameLookups Off
@@ -52,45 +52,25 @@
     # The same rules about trailing "/" apply to ScriptAlias directives as to
     # Alias.
     #
-    ScriptAlias /cgi-bin/ "/srv/www/vhosts/dummy-host.example.com/cgi-bin/"
+    ScriptAlias /cgi-bin/ "/srv/www/cgi-bin/"
 
     # "/srv/www/cgi-bin" should be changed to whatever your ScriptAliased
     # CGI directory exists, if you have one, and where ScriptAlias points to.
     #
-    <Directory "/srv/www/vhosts/dummy-host.example.com/cgi-bin">
+    <Directory "/srv/www/cgi-bin">
 	AllowOverride None
-	Options +ExecCGI -Includes
+	Options +ExecCGI -Includes +FollowSymLinks
 	Order allow,deny
 	Allow from all
+
     </Directory>
 
 
-    # UserDir: The name of the directory that is appended onto a user's home
-    # directory if a ~user request is received.
-    #
-    # To disable it, simply remove userdir from the list of modules in APACHE_MODULES
-    # in /etc/sysconfig/apache2.
-    #
-    <IfModule mod_userdir.c>
-	# Note that the name of the user directory ("public_html") cannot simply be
-	# changed here, since it is a compile time setting. The apache package
-	# would have to be rebuilt. You could work around by deleting
-	# /usr/sbin/suexec, but then all scripts from the directories would be
-	# executed with the UID of the webserver.
-	UserDir public_html
-	# The actual configuration of the directory is in
-	# /etc/apache2/mod_userdir.conf.
-	Include /etc/apache2/mod_userdir.conf
-	# You can, however, change the ~ if you find it awkward, by mapping e.g.
-	# http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/
-	#AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2
-    </IfModule>
-
 
     #
     # This should be changed to whatever you set DocumentRoot to.
     #
-    <Directory "/srv/www/vhosts/dummy-host.example.com">
+    <Directory "/home/intevation/mxd-testbed/web">
     
 	#
 	# Possible values for the Options directive are "None", "All",