X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fbin%2Fapache-template-update;h=f094eaedccde3ea0f238635784e8416151a8c1be;hb=c61c2a4ce84abe9e6685711fa827407ca84db915;hp=0ad5bc98ad2838038a86c344418a76b629624bd8;hpb=54f01e1910f918a990a38c6108356f27dbc7b049;p=mkws-moved-to-github.git

diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update
index 0ad5bc9..f094eae 100755
--- a/test/bin/apache-template-update
+++ b/test/bin/apache-template-update
@@ -11,10 +11,29 @@ 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 
+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 	
+	   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"}