X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fapache2%2Fmkws-test;h=54813ddf78179c01c04d64aa0ce73593f1f6a7e3;hb=db0d64383d90672720c63f74929ed2c9424073b9;hp=afb10e6af704df13ff63d2db8c490955ba40ee46;hpb=93563d16b22e19e55b987c32aec1bf2e4d0b8969;p=mkws-moved-to-github.git

diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test
index afb10e6..54813dd 100644
--- a/tools/apache2/mkws-test
+++ b/tools/apache2/mkws-test
@@ -14,10 +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 *
+    Header set Access-Control-Allow-Origin "*"
 
     # compress text output
     <Location />
@@ -25,10 +29,20 @@
         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=mkwsdev&password=mkwsdev [P]
+    RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=kohademo&password=kohademo [P]
+    #RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [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-sansa.indexdata.com:8080/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
+    #ProxyPass        /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/service-proxy/
+    #ProxyPassReverse /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/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/