X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fapache2%2Fjasmine-dev.template;h=1bf7ab2250372ef080c5bbcbe18ff00763417146;hb=9894123b63f50e0d21a5637472f0f6652253c112;hp=86c297a0169bffd62b69da803dcfd2edb95f9bf7;hpb=ce060b0800d633364fb63b19e693f76ba5ef7478;p=mkws-moved-to-github.git

diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index 86c297a..1bf7ab2 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -6,26 +6,18 @@
 User ${APACHE_RUN_USER}
 Group ${APACHE_RUN_GROUP}
 PidFile ${APACHE_PID_FILE}
+LockFile ${APACHE_LOCK_FILE}
 
+ServerName localhost
 ServerRoot ${APACHE_SERVER_ROOT}
 NameVirtualHost *:${APACHE_PORT}
 Listen ${APACHE_PORT}
 
-LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+Include ${APACHE_MODULES}
 
-Include /etc/apache2/mods-enabled/alias.load
-Include /etc/apache2/mods-enabled/authz*.load
-Include /etc/apache2/mods-enabled/proxy*.load
-Include /etc/apache2/mods-enabled/rewrite.load
-Include /etc/apache2/mods-enabled/headers.load
-Include /etc/apache2/mods-enabled/mime.load
-Include /etc/apache2/mods-enabled/deflate.load
-
-Include /etc/apache2/mods-enabled/alias*.conf
-Include /etc/apache2/mods-enabled/authz*.conf
-Include /etc/apache2/mods-enabled/proxy*.conf
-Include /etc/apache2/mods-enabled/mime.conf
-Include /etc/apache2/mods-enabled/deflate.conf
+<IfModule log_config_module>
+   #LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+</IfModule>
 
 # pazpar2 / service proxy config
 <VirtualHost *:${APACHE_PORT}>
@@ -57,13 +49,13 @@ Include /etc/apache2/mods-enabled/deflate.conf
     </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://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://localhost:8004/pazpar2/
     ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/