X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-live;h=35f396acaeb46bb7a0acdb5b82576bd43eee704f;hb=2a018c383403696e6677510510815ffd4624bd0b;hp=dfa7ed4758945f902a503ef4d2b98f7d85d7a30d;hpb=39aa1afba01fe4a7cef82c0f13b3e389203996b8;p=mkws-moved-to-github.git

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index dfa7ed4..35f396a 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -1,38 +1,35 @@
 # Configuration for the apache web server
 # Running on caliban
 
-
-<VirtualHost *:80>
-    ServerName somesite.indexdata.com
-    DocumentRoot /home/indexdata/mkws/experiments/spclient/
-    ErrorLog /var/log/apache2/somesite-error.log
-    CustomLog /var/log/apache2/somesite-access.log combined
-</VirtualHost>
-
-
 <VirtualHost *:80>
     ServerName mkws.indexdata.com
 
     ErrorLog /var/log/apache2/mkws-error.log
     CustomLog /var/log/apache2/mkws-access.log combined
 
-    DocumentRoot /home/indexdata/mkws/experiments/spclient/
+    DocumentRoot /home/indexdata/mkws/tools/htdocs
     Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
-    Alias /index.html /home/indexdata/mkws/experiments/spclient/index-mkws.html
+    Alias /pazpar2/ /home/indexdata/pazpar2/
 
     RewriteEngine on
     RewriteLogLevel 1
     RewriteLog /var/log/apache2/mkws-rewrite.log 
-    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
+    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
+
+    # The following rule allows the server to accept service-proxy
+    # requests that begin with an escaped "%3F" rather than a literal
+    # "?". This is useful, as requests generated by ProxyPass
+    # elsewhere always have the leading "?" escaped for some reason.
+    RewriteRule /service-proxy/\?(.*) /service-proxy/?$1 [P] # [NE,P]
 
     Header set Access-Control-Allow-Credentials true
 
     # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
 
     PerlOptions +Parent
-    PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
+    PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
     <Location /service-proxy>
         PerlOutputFilterHandler MyApache2::SetACAO
     </Location>