X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fapache2%2Fjasmine-dev.template;h=088b7417113112944eaae6c4485335448bb00a0a;hb=3873b063d97986fdfe5b5303d6909041eb065a7e;hp=935ec416691024cacc91c1154664c35088788a0c;hpb=ea0fe869ce52ffafe524d8a8c70ff8b725a45daa;p=mkws-moved-to-github.git

diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index 935ec41..088b741 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -16,7 +16,7 @@ Listen ${APACHE_PORT}
 Include ${APACHE_MODULES}
 
 <IfModule log_config_module>
-   #LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+   LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
 </IfModule>
 
 # pazpar2 / service proxy config
@@ -49,10 +49,10 @@ Include ${APACHE_MODULES}
     </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]
 
     # 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]
 
     ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
     ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/