X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fbin%2Fapache-template-update;h=54d2f8c845bf6bba7cb9eb23e26cffc29377f609;hb=716e558cbabb81871cce5cba786e02b99fc5ecac;hp=b346dbb0fe9d2914ffeb4773d76622da3b86a7e9;hpb=4d4ad42a0066451c2a0d7bbeedb3a22bb879ea2f;p=mkws-moved-to-github.git

diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update
index b346dbb..54d2f8c 100755
--- a/test/bin/apache-template-update
+++ b/test/bin/apache-template-update
@@ -11,16 +11,28 @@ 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_PORT=4040
+export APACHE_LOCK_FILE=$APACHE_LOG_DIR/accept.lock
+: ${APACHE_PORT=4040}; export APACHE_PORT
 
 export MKWS_ROOT=$(pwd)/..
 
 MKWS_OS=debian 
+APACHE_VERSION=2.2
 case $(uname) in
-  Darwin ) MKWS_OS=macos ;;
+  Darwin ) MKWS_OS=macos 
+	   test -e libexec || ln -fs /usr/libexec .
+	   ;;
   Linux )  MKWS_OS=debian 
 	   if [ -e /etc/debian_version ]; then
-		MKWS_OS=debian 	
+		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 ;;
@@ -28,9 +40,13 @@ 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"}
+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
-