From: Mike Taylor <mike@indexdata.com>
Date: Thu, 22 May 2014 11:07:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~621
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=daa145f9793642b5545c99b3222f31fe3743c858;hp=7909feac67ed8ae98aa1163e8e5d978e86a1ee92;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

diff --git a/test/Makefile b/test/Makefile
index 8547d4e..45c3422 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,7 +14,7 @@ IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 PERL_SCRIPTS=	bin/bomb.pl
 TMP_DIR=	./logs
-APACHE_HTTPD=	/usr/sbin/apache2
+APACHE_HTTPD:=	$(shell env PATH=$$PATH:/usr/sbin which apache2 httpd)
 
 all: check
 
diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update
index 0ad5bc9..4f37a41 100755
--- a/test/bin/apache-template-update
+++ b/test/bin/apache-template-update
@@ -11,10 +11,27 @@ 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)/..
 
+MKWS_OS=debian 
+case $(uname) in
+  Darwin ) MKWS_OS=macos ;;
+  Linux )  MKWS_OS=debian 
+	   if [ -e /etc/debian_version ]; then
+		MKWS_OS=debian 	
+	   fi
+	   if [ -e /etc/redhat-release ]; then
+		MKWS_OS=centos 	
+	   fi
+	   ;;
+  * ) MKWS_OS=debian ;;
+esac
+
+export APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules.$MKWS_OS.conf"
+
 : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template"}
 : ${MKWS_APACHE_FILE="$APACHE_LOG_DIR/jasmine-dev"}
 
diff --git a/tools/apache2/jasmine-dev.apache-modules.centos.conf b/tools/apache2/jasmine-dev.apache-modules.centos.conf
new file mode 100644
index 0000000..8bd7cbd
--- /dev/null
+++ b/tools/apache2/jasmine-dev.apache-modules.centos.conf
@@ -0,0 +1,27 @@
+
+LoadModule alias_module /etc/httpd/modules/mod_alias.so
+LoadModule authz_host_module /etc/httpd/modules/mod_authz_host.so
+LoadModule authz_groupfile_module /etc/httpd/modules/mod_authz_groupfile.so
+LoadModule authz_user_module /etc/httpd/modules/mod_authz_user.so
+LoadModule authz_dbm_module /etc/httpd/modules/mod_authz_dbm.so
+LoadModule authz_owner_module /etc/httpd/modules/mod_authz_owner.so
+LoadModule authz_default_module /etc/httpd/modules/mod_authz_default.so
+
+LoadModule proxy_module /etc/httpd/modules/mod_proxy.so
+LoadModule proxy_connect_module /etc/httpd/modules/mod_proxy_connect.so
+LoadModule proxy_ftp_module /etc/httpd/modules/mod_proxy_ftp.so
+LoadModule proxy_http_module /etc/httpd/modules/mod_proxy_http.so
+
+LoadModule rewrite_module /etc/httpd/modules/mod_rewrite.so
+LoadModule headers_module /etc/httpd/modules/mod_headers.so
+
+LoadModule mime_magic_module /etc/httpd/modules/mod_mime_magic.so
+LoadModule mime_module /etc/httpd/modules/mod_mime.so
+
+LoadModule deflate_module /etc/httpd/modules/mod_deflate.so
+
+#
+LoadModule log_config_module /etc/httpd/modules/mod_log_config.so
+
+#
+TypesConfig /etc/mime.types
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}>