From ea0fe869ce52ffafe524d8a8c70ff8b725a45daa Mon Sep 17 00:00:00 2001
From: Wolfram Schneider <wosch@indexdata.dk>
Date: Thu, 22 May 2014 10:18:39 +0200
Subject: [PATCH] run on MacOS

---
 test/bin/apache-template-update                    |    1 +
 .../apache2/jasmine-dev.apache-modules.debian.conf |   14 ++++++++++++
 .../apache2/jasmine-dev.apache-modules.macos.conf  |   24 ++++++++++++++++++++
 tools/apache2/jasmine-dev.template                 |   21 +++++------------
 4 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 tools/apache2/jasmine-dev.apache-modules.debian.conf
 create mode 100644 tools/apache2/jasmine-dev.apache-modules.macos.conf

diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update
index b346dbb..fc95b00 100755
--- a/test/bin/apache-template-update
+++ b/test/bin/apache-template-update
@@ -11,6 +11,7 @@ export APACHE_RUN_GROUP=$(groups | awk '{ print $1 }')
 
 export APACHE_LOG_DIR=$APACHE_SERVER_ROOT/logs
 export APACHE_PID_FILE=$APACHE_LOG_DIR/mkws-jasmine.pid
+export APACHE_LOCK_FILE=$APACHE_LOG_DIR/accept.lock
 export APACHE_PORT=4040
 
 export MKWS_ROOT=$(pwd)/..
diff --git a/tools/apache2/jasmine-dev.apache-modules.debian.conf b/tools/apache2/jasmine-dev.apache-modules.debian.conf
new file mode 100644
index 0000000..501c779
--- /dev/null
+++ b/tools/apache2/jasmine-dev.apache-modules.debian.conf
@@ -0,0 +1,14 @@
+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
+
diff --git a/tools/apache2/jasmine-dev.apache-modules.macos.conf b/tools/apache2/jasmine-dev.apache-modules.macos.conf
new file mode 100644
index 0000000..c164d4e
--- /dev/null
+++ b/tools/apache2/jasmine-dev.apache-modules.macos.conf
@@ -0,0 +1,24 @@
+
+LoadModule alias_module libexec/apache2/mod_alias.so
+LoadModule authz_host_module libexec/apache2/mod_authz_host.so
+LoadModule authz_groupfile_module libexec/apache2/mod_authz_groupfile.so
+LoadModule authz_user_module libexec/apache2/mod_authz_user.so
+LoadModule authz_dbm_module libexec/apache2/mod_authz_dbm.so
+LoadModule authz_owner_module libexec/apache2/mod_authz_owner.so
+LoadModule authz_default_module libexec/apache2/mod_authz_default.so
+
+LoadModule proxy_module libexec/apache2/mod_proxy.so
+LoadModule proxy_connect_module libexec/apache2/mod_proxy_connect.so
+LoadModule proxy_ftp_module libexec/apache2/mod_proxy_ftp.so
+LoadModule proxy_http_module libexec/apache2/mod_proxy_http.so
+
+LoadModule rewrite_module libexec/apache2/mod_rewrite.so
+LoadModule headers_module libexec/apache2/mod_headers.so
+
+LoadModule mime_magic_module libexec/apache2/mod_mime_magic.so
+LoadModule mime_module libexec/apache2/mod_mime.so
+
+LoadModule deflate_module libexec/apache2/mod_deflate.so
+
+#
+LoadModule log_config_module libexec/apache2/mod_log_config.so
diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index a2aac5a..935ec41 100644
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -6,27 +6,18 @@
 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}
 
-LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-
-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
+Include ${APACHE_MODULES}
+
+<IfModule log_config_module>
+   #LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+</IfModule>
 
 # pazpar2 / service proxy config
 <VirtualHost *:${APACHE_PORT}>
-- 
1.7.10.4