X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=tools%2Fapache2%2Fjasmine-dev.template;h=6d73893a87328d364dbc536ff88328daf7866c2f;hb=71a3bc5e72fdcf2a51c3d32f10b8248c0ac5399c;hp=defa2d9a9baf8399002e4db12a8e93d4d6e5a0ff;hpb=0dfb3c1f21455f33c8715e50d65804e098a75f1b;p=mkws-moved-to-github.git
diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index defa2d9..6d73893 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -1,20 +1,44 @@
# Configuration for the apache web server -*- apache -*-
+#####################################################################
+# 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}
+
+Include ${APACHE_MODULES}
+
+
+ # %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
+
+
# pazpar2 / service proxy config
-
+
ServerName localhost
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%/mkws-dev-error.log
- CustomLog %APACHE_LOG%/mkws-dev-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%/mkws-dev-rewrite.log
+ RewriteLog ${APACHE_LOG_DIR}/mkws-jasmine-rewrite-${APACHE_PORT}.log
- DocumentRoot %MKWS_ROOT%/examples/htdocs
- Alias /tools/htdocs %MKWS_ROOT%/tools/htdocs
+ 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
@@ -27,13 +51,13 @@
# 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/