From: Mike Taylor Date: Tue, 8 Jul 2014 12:46:53 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws X-Git-Tag: 1.0.0~411 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=e8547babff63b79ec6d0145194a7b0153774b76f;hp=7bd030f15309e4349183ea5d5961378706f357d0;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws --- diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live index 0630d14..0614a85 100644 --- 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