X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fapache2%2Fjasmine-dev.template;h=935ec416691024cacc91c1154664c35088788a0c;hb=bde748b8cb0407f28b6401db33df36de6ea265af;hp=2c7d969e9fa4573e4d0245208a589290d0f07198;hpb=4ccbf02d756d42f2c76e090b8f08abaced759f8e;p=mkws-moved-to-github.git
diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index 2c7d969..935ec41 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -1,24 +1,42 @@
# Configuration for the apache web server -*- apache -*-
+#####################################################################
+# global apache2 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}
+
+
+ #LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{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_DIR}/mkws-dev-error.log
- CustomLog ${APACHE_LOG_DIR}/mkws-dev-access.log combined
+ ErrorLog ${APACHE_LOG_DIR}/mkws-jasmine-error.log
+ CustomLog ${APACHE_LOG_DIR}/mkws-jasmine-access.log combined
RewriteEngine on
RewriteLogLevel 1
- RewriteLog ${APACHE_LOG_DIR}/mkws-dev-rewrite.log
+ RewriteLog ${APACHE_LOG_DIR}/mkws-jasmine-rewrite.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
@@ -36,8 +54,8 @@ PidFile ${APACHE_PID_FILE}
# mkws devel account (e.g. memached testing)
RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,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/