X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-test;h=f71972a424c3d800f36d484fd4d5d594f4d174b3;hb=9894123b63f50e0d21a5637472f0f6652253c112;hp=65ea77b5a245324bf7e2bd5c379c342ad8b8db03;hpb=d9d6252b95153b1fc823aac9f8d75ad82e88739d;p=mkws-moved-to-github.git

diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test
index 65ea77b..f71972a 100644
--- a/tools/apache2/mkws-test
+++ b/tools/apache2/mkws-test
@@ -3,7 +3,7 @@
 # pazpar2 / service proxy config
 <VirtualHost *:80>
     ServerName mkws-test.indexdata.com
-    ServerAlias mkws-test
+    ServerAlias mkws-test spclient-dev.indexdata.com
     ServerAdmin webmaster@indexdata.com
     ErrorLog /var/log/apache2/mkws-test-error.log
     CustomLog /var/log/apache2/mkws-test-access.log combined
@@ -14,6 +14,14 @@
 
     DocumentRoot /home/indexdata/mkws-test/examples/htdocs
     Alias /tools/htdocs /home/indexdata/mkws-test/tools/htdocs
+    Alias /src /home/indexdata/mkws-test/src
+    Alias /test /home/indexdata/mkws-test/test
+    Alias /jasmine /home/indexdata/mkws-test/examples/jasmine
+
+
+    # CORS setting
+    Header set Access-Control-Allow-Credentials true
+    Header set Access-Control-Allow-Origin "*"
 
     # compress text output
     <Location />
@@ -21,10 +29,14 @@
         SetOutputFilter DEFLATE 
     </Location> 
 
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
+    # standard MKWS account
+    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkws&password=mkws [P]
+
+    # jasmine test account
+    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwstest&password=mkwstest [P]
 
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
 
     ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
     ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/