projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a9756ba
)
general support for apache 2.4, MKWS-332
author
Wolfram Schneider
<wosch@indexdata.dk>
Fri, 7 Nov 2014 22:00:49 +0000
(23:00 +0100)
committer
Wolfram Schneider
<wosch@indexdata.dk>
Fri, 7 Nov 2014 22:00:49 +0000
(23:00 +0100)
test/bin/apache-template-update
patch
|
blob
|
history
diff --git
a/test/bin/apache-template-update
b/test/bin/apache-template-update
index
db0c6e5
..
1d57632
100755
(executable)
--- a/
test/bin/apache-template-update
+++ b/
test/bin/apache-template-update
@@
-28,9
+28,6
@@
case $(uname) in
Linux ) MKWS_OS=debian
if [ -e /etc/debian_version ]; then
MKWS_OS=debian
- if $apache2 -v | egrep -q 'Server version: Apache/2\.4\.'; then
- APACHE_VERSION=2.4
- fi
fi
if [ -e /etc/redhat-release ]; then
MKWS_OS=centos
@@
-39,6
+36,10
@@
case $(uname) in
* ) MKWS_OS=debian ;;
esac
+if $apache2 -v | egrep -q 'Server version: Apache/2\.4\.'; then
+ APACHE_VERSION=2.4
+fi
+
if [ "$APACHE_VERSION" = "2.4" ]; then
: ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template-$APACHE_VERSION"}