X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fapache2%2Fjasmine-dev.template;h=6ec427f60bbbd50654eddbf8c58e04d0c6f4f238;hb=5f39e98368832c582017b10f9ce0bb77eb441c44;hp=36c99b94f850409d69c4cc1714b0daf9b2b1bc6c;hpb=d0bd4aea18a9c6384e94da3e00151da21e384858;p=mkws-moved-to-github.git
diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index 36c99b9..6ec427f 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -1,20 +1,45 @@
# 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}
+ErrorLog ${APACHE_LOG_DIR}/error-${APACHE_PORT}.log
+
+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 mkws-dev.indexdata.com
- ServerAlias mkws-dev a.mkws.indexdata.com a.mkws-dev.indexdata.com
+
+ 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 /var/log/apache2/mkws-dev-error.log
- CustomLog /var/log/apache2/mkws-dev-access.log combined
+ ErrorLog ${APACHE_LOG_DIR}/mkws-jasmine-error-${APACHE_PORT}.log
+ CustomLog ${APACHE_LOG_DIR}/mkws-jasmine-access-${APACHE_PORT}.log combined
RewriteEngine on
RewriteLogLevel 1
- RewriteLog /var/log/apache2/mkws-dev-rewrite.log
+ RewriteLog ${APACHE_LOG_DIR}/mkws-jasmine-rewrite-${APACHE_PORT}.log
- DocumentRoot /home/indexdata/mkws-dev/examples/htdocs
- Alias /tools/htdocs /home/indexdata/mkws-dev/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 +52,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/