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

diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index 935ec41..92e22cb 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -1,7 +1,7 @@
 # Configuration for the apache web server                 -*- apache -*-
 
 #####################################################################
-# global apache2 config
+# global apache 2.2 config
 #
 User ${APACHE_RUN_USER}
 Group ${APACHE_RUN_GROUP}
@@ -16,7 +16,9 @@ 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
+   # %O only works if mod_logio is enabled, which it isn't on Mike's MacBook
+   # 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 \"%{Referer}i\" \"%{User-Agent}i\"" combined
 </IfModule>
 
 # pazpar2 / service proxy config
@@ -49,10 +51,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/