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

[irspy-moved-to-github.git] / web / conf / apache2.0 / irspy.conf

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index 5ed902a..6d7573f 100644 (file)
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -1,5 +1,3 @@
-# $Id: cfspy.conf,v 1.4 2009-04-16 18:31:20 wosch Exp $
-#
 # Sample configuration for running an IRSpy web-site under Apache 2.x.
 #
 # This is the configuration that I use on the development machine 
@@ -14,7 +12,7 @@
 
 <VirtualHost *:80>
     ServerName irspy.indexdata.com
-    ServerAlias irspy2.indexdata.com irspy
+    #ServerAlias irspy2.indexdata.com irspy
 
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined
@@ -43,5 +41,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:12367/
+    ProxyPassReverse  /toroid/ http://localhost:12367/
 </VirtualHost>