X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-test;h=23e744eab7c10d12f5fd94ef6efd5c7462ab57aa;hp=2b20e3784f576fefbf10798c6c322600855a7801;hb=d9392af31cad0e75d09f5dda9c82a30e6ce4476f;hpb=0ebd34b0a77779b746a1ef048f92dfeffdd7dc4f;ds=sidebyside

diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test
index 2b20e37..23e744e 100644
--- a/tools/apache2/mkws-test
+++ b/tools/apache2/mkws-test
@@ -14,6 +14,13 @@
 
     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
+
+    Alias /demos/src /home/indexdata/mkws-test/src
+    Alias /demos/tools/htdocs /home/indexdata/mkws-test/tools/htdocs
+    Alias /demos /home/indexdata/demos
 
     # CORS setting
     Header set Access-Control-Allow-Credentials true
@@ -26,13 +33,21 @@
     </Location> 
 
     # standard MKWS account
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
+    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkws&password=mkws [P]
 
     # jasmine test account
-    RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
-
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    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://sp-mkws02.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkws02.indexdata.com/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/