From: Mike Taylor Date: Mon, 11 Aug 2014 08:07:23 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws X-Git-Tag: 1.0.0~346 X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=9a014ab5361271c32b1dcdfb1639ee6041814015;hp=4dcc70d0fd93ccf54e3b218c68839beabf93ecf9 Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws --- diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update index 54d2f8c..6c90341 100755 --- a/test/bin/apache-template-update +++ b/test/bin/apache-template-update @@ -16,37 +16,39 @@ export APACHE_LOCK_FILE=$APACHE_LOG_DIR/accept.lock export MKWS_ROOT=$(pwd)/.. -MKWS_OS=debian +MKWS_OS=debian APACHE_VERSION=2.2 +apache2=$(env PATH=/bin:/usr/bin:/usr/sbin which apache2 httpd false 2>/dev/null | head -1) + case $(uname) in - Darwin ) MKWS_OS=macos + Darwin ) MKWS_OS=macos test -e libexec || ln -fs /usr/libexec . ;; - Linux ) MKWS_OS=debian + Linux ) MKWS_OS=debian if [ -e /etc/debian_version ]; then 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 + 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 + MKWS_OS=centos fi ;; * ) MKWS_OS=debian ;; esac -export APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules.$MKWS_OS.conf" if [ "$APACHE_VERSION" = "2.4" ]; then - : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template-2.4"} + : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template-$APACHE_VERSION"} + APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules-$APACHE_VERSION.$MKWS_OS.conf" else - : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template"} + : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template"} + 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"} +export APACHE_MODULES perl -npe 's,\${(.*?)},$ENV{$1},g; ' $MKWS_APACHE_TEMPLATE > $MKWS_APACHE_FILE.tmp mv -f $MKWS_APACHE_FILE.tmp $MKWS_APACHE_FILE diff --git a/test/spec/mkws-config.js b/test/spec/mkws-config.js index d168fb2..59a0132 100644 --- a/test/spec/mkws-config.js +++ b/test/spec/mkws-config.js @@ -18,6 +18,10 @@ describe("Check mkws.config object", function () { expect(mkws.locale_lang.da.Location).toMatch(/^Lokation$/); }); + /* + * this is a test if the config value is a boolean JavaScript object: true or false + * and nothing else (0, '0', undefined, "false" etc.) + */ it("mkws.config service proxy enabled/disabled", function () { if (mkws.config.use_service_proxy) { expect(mkws.config.use_service_proxy).toBe(true); diff --git a/tools/apache2/jasmine-dev.apache-modules-2.4.debian.conf b/tools/apache2/jasmine-dev.apache-modules-2.4.debian.conf new file mode 100644 index 0000000..ca48beb --- /dev/null +++ b/tools/apache2/jasmine-dev.apache-modules-2.4.debian.conf @@ -0,0 +1,21 @@ +# apache 2.4 + +Include /etc/apache2/mods-available/alias.load +Include /etc/apache2/mods-available/authz*.load +Include /etc/apache2/mods-available/proxy*.load +Include /etc/apache2/mods-available/rewrite.load +Include /etc/apache2/mods-available/headers.load +Include /etc/apache2/mods-available/mime.load +Include /etc/apache2/mods-available/deflate.load + +Include /etc/apache2/mods-available/alias*.conf +Include /etc/apache2/mods-available/proxy*.conf +Include /etc/apache2/mods-available/mime.conf +Include /etc/apache2/mods-available/deflate.conf + +Include /etc/apache2/mods-enabled/mpm*conf +Include /etc/apache2/mods-enabled/mpm*load +Include /etc/apache2/mods-available/xml2enc.load +Include /etc/apache2/mods-available/filter.load +Include /etc/apache2/mods-available/slotmem_shm.load + diff --git a/tools/apache2/jasmine-dev.apache-modules.ubuntu.conf b/tools/apache2/jasmine-dev.apache-modules.ubuntu.conf deleted file mode 100644 index 612d1c1..0000000 --- a/tools/apache2/jasmine-dev.apache-modules.ubuntu.conf +++ /dev/null @@ -1,19 +0,0 @@ -Include /etc/apache2/mods-available/alias.load -Include /etc/apache2/mods-available/authz*.load -Include /etc/apache2/mods-available/proxy*.load -Include /etc/apache2/mods-available/rewrite.load -Include /etc/apache2/mods-available/headers.load -Include /etc/apache2/mods-available/mime.load -Include /etc/apache2/mods-available/deflate.load - -Include /etc/apache2/mods-available/alias*.conf -Include /etc/apache2/mods-available/proxy*.conf -Include /etc/apache2/mods-available/mime.conf -Include /etc/apache2/mods-available/deflate.conf - -Include /etc/apache2/mods-enabled/mpm*conf -Include /etc/apache2/mods-enabled/mpm*load -Include /etc/apache2/mods-available/xml2enc.load -Include /etc/apache2/mods-available/filter.load -Include /etc/apache2/mods-available/slotmem_shm.load - diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template index 088b741..acf7cf4 100644 --- a/tools/apache2/jasmine-dev.template +++ b/tools/apache2/jasmine-dev.template @@ -1,7 +1,7 @@ # Configuration for the apache web server -*- apache -*- ##################################################################### -# global apache2 config +# global apache 2.2 config # User ${APACHE_RUN_USER} Group ${APACHE_RUN_GROUP} diff --git a/tools/apache2/jasmine-dev.template-2.4 b/tools/apache2/jasmine-dev.template-2.4 index 6d91adf..3c0f626 100644 --- a/tools/apache2/jasmine-dev.template-2.4 +++ b/tools/apache2/jasmine-dev.template-2.4 @@ -1,7 +1,7 @@ # Configuration for the apache web server -*- apache -*- ##################################################################### -# global apache2 config +# global apache 2.4 config # User ${APACHE_RUN_USER} Group ${APACHE_RUN_GROUP}