X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fapache2%2Fjasmine-dev.template;h=6d73893a87328d364dbc536ff88328daf7866c2f;hp=c3fe88fc2e057edb45a18c66ae883ec14f1ae23e;hb=71a3bc5e72fdcf2a51c3d32f10b8248c0ac5399c;hpb=72107f57026d4a677d328b000fad3b89b3c17351

diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index c3fe88f..6d73893 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -1,31 +1,25 @@
 # Configuration for the apache web server                 -*- apache -*-
 
 #####################################################################
-# global apache2 config
+# global apache 2.2 config
 #
 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>
+   # %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
 <VirtualHost *:${APACHE_PORT}>
@@ -33,15 +27,18 @@ Include /etc/apache2/mods-enabled/deflate.conf
     ServerAlias mkws-dev a.mkws.indexdata.com a.mkws-dev.indexdata.com mkws-dev.indexdata.com 127.0.0.1
 
     ServerAdmin webmaster@indexdata.com
-    ErrorLog ${APACHE_LOG_DIR}/mkws-jasmine-error.log
-    CustomLog ${APACHE_LOG_DIR}/mkws-jasmine-access.log combined
+    ErrorLog ${APACHE_LOG_DIR}/mkws-jasmine-${APACHE_PORT}-error.log
+    CustomLog ${APACHE_LOG_DIR}/mkws-jasmine-${APACHE_PORT}-access.log combined
 
     RewriteEngine on
     RewriteLogLevel 1
-    RewriteLog ${APACHE_LOG_DIR}/mkws-jasmine-rewrite.log 
+    RewriteLog ${APACHE_LOG_DIR}/mkws-jasmine-rewrite-${APACHE_PORT}.log 
 
     DocumentRoot ${MKWS_ROOT}/examples/htdocs
     Alias /tools/htdocs ${MKWS_ROOT}/tools/htdocs
+    Alias /src ${MKWS_ROOT}/src
+    Alias /test ${MKWS_ROOT}/test
+    Alias /jasmine ${MKWS_ROOT}/examples/jasmine
 
     # CORS setting
     Header set Access-Control-Allow-Credentials true
@@ -54,13 +51,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/