From 4ccbf02d756d42f2c76e090b8f08abaced759f8e Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Mon, 7 Apr 2014 14:14:34 +0000 Subject: [PATCH] change template language to standard apache --- tools/apache2/jasmine-dev.template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template index defa2d9..2c7d969 100644 --- a/tools/apache2/jasmine-dev.template +++ b/tools/apache2/jasmine-dev.template @@ -1,20 +1,24 @@ # Configuration for the apache web server -*- apache -*- +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} +PidFile ${APACHE_PID_FILE} + # 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-dev-error.log + CustomLog ${APACHE_LOG_DIR}/mkws-dev-access.log combined RewriteEngine on RewriteLogLevel 1 - RewriteLog %APACHE_LOG%/mkws-dev-rewrite.log + RewriteLog ${APACHE_LOG_DIR}/mkws-dev-rewrite.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 # CORS setting Header set Access-Control-Allow-Credentials true -- 1.7.10.4