Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws

diff --git a/doc/mkws-developer.markdown b/doc/mkws-developer.markdown
index 3d92fc3..a6ca04b 100644 (file)
--- a/doc/mkws-developer.markdown
+++ b/doc/mkws-developer.markdown
@@ -10,7 +10,7 @@ If you are building the widget set, as opposed to just using it, you
 will need the following Debian packages (or their equivalents on your
 operating system):
 
-       $ sudo apt-get install curl git make unzip \
+       $ sudo apt-get install curl git make unzip apache2 \
            pandoc yui-compressor libbsd-resource-perl
 
 You also need Node.js, but unfortunately the `node-js` package is not

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"}

diff --git a/tools/apache2/jasmine-dev.apache-modules-2.4.macos.conf b/tools/apache2/jasmine-dev.apache-modules-2.4.macos.conf
new file mode 100644 (file)
index 0000000..7526881
--- /dev/null
+++ b/tools/apache2/jasmine-dev.apache-modules-2.4.macos.conf
@@ -0,0 +1,27 @@
+
+LoadModule alias_module libexec/apache2/mod_alias.so
+LoadModule authz_host_module libexec/apache2/mod_authz_host.so
+LoadModule authz_groupfile_module libexec/apache2/mod_authz_groupfile.so
+LoadModule authz_user_module libexec/apache2/mod_authz_user.so
+LoadModule authz_dbm_module libexec/apache2/mod_authz_dbm.so
+LoadModule authz_owner_module libexec/apache2/mod_authz_owner.so
+LoadModule authz_core_module libexec/apache2/mod_authz_core.so
+
+LoadModule proxy_module libexec/apache2/mod_proxy.so
+LoadModule proxy_connect_module libexec/apache2/mod_proxy_connect.so
+LoadModule proxy_ftp_module libexec/apache2/mod_proxy_ftp.so
+LoadModule proxy_http_module libexec/apache2/mod_proxy_http.so
+
+LoadModule rewrite_module libexec/apache2/mod_rewrite.so
+LoadModule headers_module libexec/apache2/mod_headers.so
+
+LoadModule mime_magic_module libexec/apache2/mod_mime_magic.so
+LoadModule mime_module libexec/apache2/mod_mime.so
+
+LoadModule deflate_module libexec/apache2/mod_deflate.so
+LoadModule unixd_module libexec/apache2/mod_unixd.so
+LoadModule filter_module libexec/apache2/mod_filter.so
+
+#
+LoadModule logio_module libexec/apache2/mod_logio.so
+LoadModule log_config_module libexec/apache2/mod_log_config.so