Use sp-mkws for SP authentication and access.

[mkws-moved-to-github.git] / tools / apache2 / mkws-ne

diff --git a/tools/apache2/mkws-ne b/tools/apache2/mkws-ne
index c0ade2a..7c9a3e9 100644 (file)
--- a/tools/apache2/mkws-ne
+++ b/tools/apache2/mkws-ne
@@ -14,8 +14,8 @@
     RewriteLog /var/log/apache2/mkws-dev-rewrite.log
 
     DocumentRoot /indexdata/gitprojects/mkws/examples/htdocs
-    #Alias /tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
-    #Alias /src /home/indexdata/mkws-dev/src
+    Alias /tools/htdocs /indexdata/gitprojects/mkws/tools/htdocs
+    Alias /src /indexdata/gitprojects/mkws/src
     #Alias /test /home/indexdata/mkws-dev/test
     #Alias /jasmine /home/indexdata/mkws-dev/examples/jasmine
 
@@ -30,13 +30,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-mkc.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
 
     ProxyPass        /pazpar2/         http://mk2-test.indexdata.com/test-pazpar2/
     ProxyPassReverse /pazpar2/         http://mk2-test.indexdata.com/test-pazpar2/