From 72107f57026d4a677d328b000fad3b89b3c17351 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Mon, 7 Apr 2014 14:51:51 +0000 Subject: [PATCH] add modules and missing config options --- tools/apache2/jasmine-dev.template | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template index 2c7d969..c3fe88f 100644 --- a/tools/apache2/jasmine-dev.template +++ b/tools/apache2/jasmine-dev.template @@ -1,21 +1,44 @@ # Configuration for the apache web server -*- apache -*- +##################################################################### +# global apache2 config +# User ${APACHE_RUN_USER} Group ${APACHE_RUN_GROUP} PidFile ${APACHE_PID_FILE} +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 /etc/apache2/mods-enabled/alias.load +Include /etc/apache2/mods-enabled/authz*.load +Include /etc/apache2/mods-enabled/proxy*.load +Include /etc/apache2/mods-enabled/rewrite.load +Include /etc/apache2/mods-enabled/headers.load +Include /etc/apache2/mods-enabled/mime.load +Include /etc/apache2/mods-enabled/deflate.load + +Include /etc/apache2/mods-enabled/alias*.conf +Include /etc/apache2/mods-enabled/authz*.conf +Include /etc/apache2/mods-enabled/proxy*.conf +Include /etc/apache2/mods-enabled/mime.conf +Include /etc/apache2/mods-enabled/deflate.conf + # 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 -- 1.7.10.4