X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fconf%2Fapache2.0%2Firspy.conf;h=f742d2d6dd149305a9bc3b2a48d4409168a9ec60;hb=HEAD;hp=67161ccd2235157e9e7b39fc9c8b279d1c773ef9;hpb=929666f7a7c53e064045212a810a28faf2ecc6d8;p=irspy-moved-to-github.git

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index 67161cc..f742d2d 100644
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -11,9 +11,15 @@
 # For debian & unbuntu: please read irspy/README for a list of depending packages
 #
 
+#
+# an irspy toroid process takes up to 90MB for each request
+# 90*32 => 3GB RAM
+#
+MaxClients 32
+
 <VirtualHost *:80>
     ServerName irspy.indexdata.com
-    ServerAlias irspy2.indexdata.com irspy irspy-dev.indexdata.com
+    ServerAlias irspy02.indexdata.com irspy irspy-dev.indexdata.com irspy-dev
 
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined
@@ -28,19 +34,20 @@
     PerlAddVar MasonCompRoot "private => /home/indexdata/irspy/web/htdocs"
     PerlSetVar MasonDataDir              /home/indexdata/irspy/web/data
     PerlSetVar IRSpyLibDir               /home/indexdata/irspy/lib
-    PerlSetEnv PERL5LIB 		 /home/indexdata/irspy/lib
+    PerlSetEnv PERL5LIB 		 /home/indexdata/irspy/lib:/home/indexdata/perl-indexdata-utils/lib
+    PerlSetEnv IRSPY_COUNTER_FILE        /home/indexdata/irspy/zebra/db/counter
 
     #PerlSetEnv IRSpyDbName 	localhost:8018/IR-Explain---1
 
    # We need +Parent to make PerlSwitches -I work properly ... don't ask.
    PerlOptions +Parent
-   PerlSwitches -I/home/indexdata/irspy/lib
+   PerlSwitches -I/home/indexdata/irspy/lib -I/home/indexdata/perl-indexdata-utils/lib
 
     <Location /admin>
 	AuthType Basic
 	AuthName "IRSpy Administration"
 	AuthUserFile /home/indexdata/irspy/web/conf/htpasswd
-	Require user admin
+	Require user admin irspy
     </Location>
 
     ProxyRequests off
@@ -48,7 +55,20 @@
       Order deny,allow
       Allow from all
     </Proxy>
-    ProxyPass         /toroid/ http://localhost:12367/
-    ProxyPassReverse  /toroid/ http://localhost:12367/
+
+    
+    # map /toroid to CGI script irspy-toroid.cgi
+    ScriptAlias /toroid/records	/home/indexdata/irspy-toroid/irspy-toroid.cgi 
+
+
+    # legacy ruby daemon
+    #ProxyPass         /toroid/ http://localhost:12367/
+    #ProxyPassReverse  /toroid/ http://localhost:12367/
+
+    # compress output
+    <Location />
+      AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml
+      SetOutputFilter DEFLATE
+    </Location>
 </VirtualHost>