projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reorder partial widget list in more sensible order.
[mkws-moved-to-github.git]
/
test
/
bin
/
apache-template-update
diff --git
a/test/bin/apache-template-update
b/test/bin/apache-template-update
index
29024ab
..
db0c6e5
100755
(executable)
--- a/
test/bin/apache-template-update
+++ b/
test/bin/apache-template-update
@@
-9,11
+9,12
@@
export APACHE_SERVER_ROOT=$(pwd)
export APACHE_RUN_USER=$(whoami)
export APACHE_RUN_GROUP=$(groups | awk '{ print $1 }')
export APACHE_RUN_USER=$(whoami)
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
: ${APACHE_PORT=4040}; export APACHE_PORT
: ${APACHE_PORT=4040}; export APACHE_PORT
+export APACHE_LOG_DIR=$APACHE_SERVER_ROOT/logs
+export APACHE_PID_FILE=$APACHE_LOG_DIR/mkws-jasmine-${APACHE_PORT}.pid
+export APACHE_LOCK_FILE=$APACHE_LOG_DIR/accept-${APACHE_PORT}.lock
+
export MKWS_ROOT=$(pwd)/..
MKWS_OS=debian
export MKWS_ROOT=$(pwd)/..
MKWS_OS=debian
@@
-47,7
+48,7
@@
else
APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules.$MKWS_OS.conf"
fi
APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules.$MKWS_OS.conf"
fi
-: ${MKWS_APACHE_FILE="$APACHE_LOG_DIR/jasmine-dev"}
+: ${MKWS_APACHE_FILE="$APACHE_LOG_DIR/jasmine-dev-${APACHE_PORT}.conf"}
export APACHE_MODULES
perl -npe 's,\${(.*?)},$ENV{$1},g; ' $MKWS_APACHE_TEMPLATE > $MKWS_APACHE_FILE.tmp
export APACHE_MODULES
perl -npe 's,\${(.*?)},$ENV{$1},g; ' $MKWS_APACHE_TEMPLATE > $MKWS_APACHE_FILE.tmp