X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fbin%2Fapache-template-update;h=54d2f8c845bf6bba7cb9eb23e26cffc29377f609;hb=431016e6786908aef265c74f28c8b3ddc230e2f6;hp=54be8e0990be357ea300e6f83349788b6f8f6db4;hpb=58d7d6b62eeab782de4ce78349efcc66a4cdead8;p=mkws-moved-to-github.git

diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update
index 54be8e0..54d2f8c 100755
--- a/test/bin/apache-template-update
+++ b/test/bin/apache-template-update
@@ -8,15 +8,45 @@
 export APACHE_SERVER_ROOT=$(pwd)
 export APACHE_RUN_USER=$(whoami)
 export APACHE_RUN_GROUP=$(groups | awk '{ print $1 }')
-export APACHE_PID_FILE=$PWD/logs/mkws-jasmine.pid
-export APACHE_LOG_DIR=$PWD/logs
-export APACHE_PORT=4040
+
+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
+: ${APACHE_PORT=4040}; export APACHE_PORT
 
 export MKWS_ROOT=$(pwd)/..
 
-: ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template"}
-: ${MKWS_APACHE_FILE="$MKWS_ROOT/tools/apache2/jasmine-dev"}
+MKWS_OS=debian 
+APACHE_VERSION=2.2
+case $(uname) in
+  Darwin ) MKWS_OS=macos 
+	   test -e libexec || ln -fs /usr/libexec .
+	   ;;
+  Linux )  MKWS_OS=debian 
+	   if [ -e /etc/debian_version ]; then
+		MKWS_OS=debian
+		# Ubuntu with Apache 2.2 can continue using debian
+		if /usr/bin/dpkg -s apache2 | grep -q "Version: 2\.4\..*ubuntu"; then
+			MKWS_OS=ubuntu
+                        APACHE_VERSION=2.4
+	   	fi
+	   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"
+
+if [ "$APACHE_VERSION" = "2.4" ]; then
+	: ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template-2.4"}
+else
+	: ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template"}
+fi
+: ${MKWS_APACHE_FILE="$APACHE_LOG_DIR/jasmine-dev"}
+
 
 perl -npe 's,\${(.*?)},$ENV{$1},g; ' $MKWS_APACHE_TEMPLATE > $MKWS_APACHE_FILE.tmp
 mv -f $MKWS_APACHE_FILE.tmp $MKWS_APACHE_FILE
-