X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fbin%2Fapache-template-update;h=4f37a413c838cce8bce6d02dd5ba2cb7ce14370f;hb=b0dabcd2993438c7326c44ee76da8c6bf67e8a37;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..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"}