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

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index 5ed902a..db43e05 100644 (file)
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -43,5 +43,13 @@
        AuthUserFile /usr/local/src/git/irspy/web/conf/htpasswd
        Require user admin
     </Location>
+
+    ProxyRequests off
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+    </Proxy>
+    ProxyPass         /toroid/ http://localhost:3000/
+    ProxyPassReverse  /toroid/ http://localhost:3000/
 </VirtualHost>