Support Apache 2.4 for phantomjs test

[mkws-moved-to-github.git] / tools / apache2 / mkws-live

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 630170d..9d74c0a 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -31,37 +31,7 @@
     Header set Access-Control-Allow-Credentials true
 
     # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
-    ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
-    # Or use: sp-mkc-sansa.indexdata.com:8080 or sp-mkc-arya.indexdata.com:8080
-
-    PerlOptions +Parent
-    PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
-    <Location /service-proxy>
-        PerlOutputFilterHandler MyApache2::SetACAO
-    </Location>
-</VirtualHost>
-
-# Separate hostname for the MKWS instance of the Service Proxy.
-# This allows us to use a different SP configuration that handles
-# authentication differently.
-#
-# Once this is in universal use, we can get rid of the Service Proxy
-# stuff in the configuration for mkws.indexdata.com
-#
-<VirtualHost *:80>
-    ServerName sp-mkws.indexdata.com
-
-    ErrorLog /var/log/apache2/sp-mkws-error.log
-    CustomLog /var/log/apache2/sp-mkws-access.log combined
-
-    DocumentRoot /home/indexdata/mkws/tools/sp-htdocs
-
-    # No rewriting on this server: use the true URL.
-    # (The security value of rewrite is when the application site does it.)
-
-    Header set Access-Control-Allow-Credentials true
-
+#    ProxyPreserveHost On
     ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
     ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
     # Or use: sp-mkc-sansa.indexdata.com:8080 or sp-mkc-arya.indexdata.com:8080