From: Mike Taylor <mike@indexdata.com>
Date: Tue, 9 Jul 2013 12:06:12 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 0.9.1~305^2~3^2
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=aa4072a553e49828bc321d6a0e9340568c626408;hp=578f70911f1f3af6128946bb98b655cb97c58af0;p=mkws-moved-to-github.git

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

diff --git a/tools/apache2/mkws-dev-proxy b/tools/apache2/mkws-dev-proxy
new file mode 100644
index 0000000..ef05c02
--- /dev/null
+++ b/tools/apache2/mkws-dev-proxy
@@ -0,0 +1,19 @@
+<VirtualHost *:80>
+    ServerName mkws-dev.indexdata.com
+    ServerAlias spclient-dev.indexdata.com
+
+    ProxyRequests off
+    ProxyVia On
+    ProxyPreserveHost On
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+    </Proxy>
+
+    ProxyPass         / http://dart:80/
+    ProxyPassReverse  / http://dart:80/
+
+    # These are the logs for the proxying operation
+    ErrorLog /var/log/apache2/mkws-dev-proxy-error.log
+    CustomLog /var/log/apache2/mkws-dev-proxy-access.log combined
+</VirtualHost>