Merge remote branch 'origin/master' into wosch

diff --git a/test/Makefile b/test/Makefile
index ce5c954..7ac5062 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -28,6 +28,7 @@ clean:
 distclean: clean clean-tmp clean-error
        rm -rf node_modules
        rm -f ${TMP_DIR}/jasmine-dev
+       rm -f libexec
 
 clean-error:
        rm -f mkws-error.png.* mkws-error.html.*

diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update
index bf14cbd..f094eae 100755 (executable)
--- a/test/bin/apache-template-update
+++ b/test/bin/apache-template-update
@@ -18,7 +18,9 @@ export MKWS_ROOT=$(pwd)/..
 
 MKWS_OS=debian 
 case $(uname) in
-  Darwin ) MKWS_OS=macos ;;
+  Darwin ) MKWS_OS=macos 
+          test -e libexec || ln -fs /usr/libexec .
+          ;;
   Linux )  MKWS_OS=debian 
           if [ -e /etc/debian_version ]; then
                MKWS_OS=debian  

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 0630d14..9d74c0a 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -31,6 +31,7 @@
     Header set Access-Control-Allow-Credentials true
 
     # For MKC Service Proxy
+#    ProxyPreserveHost On
     ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
     ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
     # Or use: sp-mkc-sansa.indexdata.com:8080 or sp-mkc-arya.indexdata.com:8080