X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-dev;h=369dcf9fddd230e4e7f76c382d5ead6b6a7093ef;hp=17a2141edfc7f1f99880d226aeb70fb73a63c0a0;hb=d7f1128baeef8abab168cf28d937ea5583b99fc6;hpb=7880b3b0227a9f698fe9b93974125dc25b55e9ef

diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index 17a2141..369dcf9 100644
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -19,6 +19,10 @@
     Alias /test /home/indexdata/mkws-dev/test
     Alias /jasmine /home/indexdata/mkws-dev/examples/jasmine
 
+    Alias /demos/src /home/indexdata/mkws-dev/src
+    Alias /demos/tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
+    Alias /demos /home/indexdata/demos
+
     # CORS setting
     Header set Access-Control-Allow-Credentials true
     Header set Access-Control-Allow-Origin "*"
@@ -30,13 +34,13 @@
     </Location> 
 
     # jasmine test account
-    RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
 
     # mkws devel account (e.g. memached testing)
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P]
+    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,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-mkws.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkws.indexdata.com/service-proxy/
 
     ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
     ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/