X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fapache2%2Fjasmine-dev.template;h=6ec427f60bbbd50654eddbf8c58e04d0c6f4f238;hb=HEAD;hp=a2aac5ab9bdbdca48d3d34946a429784a36f897d;hpb=9ef41c241ae5f157e65a40f67c56ae74d3d6d9c0;p=mkws-moved-to-github.git
diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index a2aac5a..6ec427f 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -1,32 +1,26 @@
# 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}
+ErrorLog ${APACHE_LOG_DIR}/error-${APACHE_PORT}.log
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-available/alias.load
-Include /etc/apache2/mods-available/authz*.load
-Include /etc/apache2/mods-available/proxy*.load
-Include /etc/apache2/mods-available/rewrite.load
-Include /etc/apache2/mods-available/headers.load
-Include /etc/apache2/mods-available/mime.load
-Include /etc/apache2/mods-available/deflate.load
-
-Include /etc/apache2/mods-available/alias*.conf
-Include /etc/apache2/mods-available/authz*.conf
-Include /etc/apache2/mods-available/proxy*.conf
-Include /etc/apache2/mods-available/mime.conf
-Include /etc/apache2/mods-available/deflate.conf
+
+ # %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
@@ -34,12 +28,12 @@ Include /etc/apache2/mods-available/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-error-${APACHE_PORT}.log
+ CustomLog ${APACHE_LOG_DIR}/mkws-jasmine-access-${APACHE_PORT}.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
@@ -58,10 +52,10 @@ Include /etc/apache2/mods-available/deflate.conf
# 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/