X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-live;h=e3ed20758cad7948d3f923c55e42491f99da42aa;hb=b6a4114b245ffe3643d5f7aa580012f4a5227715;hp=74b225ae062eebac2cef9554ae85ed3a4cc600d6;hpb=2ce9a208ebac8e7fb69b93c6b23dce24c92d6288;p=mkws-moved-to-github.git

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 74b225a..e3ed207 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -7,15 +7,21 @@
     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]
 
+    # 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
@@ -23,7 +29,7 @@
     ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/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>