projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve conflicts
[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
efa8d5b
..
3ba0447
100644
(file)
--- 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
#
# 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
<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
ErrorLog /var/log/apache2/irspy-error.log
CustomLog /var/log/apache2/irspy-access.log combined
@@
-40,7
+46,7
@@
AuthType Basic
AuthName "IRSpy Administration"
AuthUserFile /home/indexdata/irspy/web/conf/htpasswd
AuthType Basic
AuthName "IRSpy Administration"
AuthUserFile /home/indexdata/irspy/web/conf/htpasswd
- Require user admin
+ Require user admin irspy
</Location>
ProxyRequests off
</Location>
ProxyRequests off
@@
-53,6
+59,7
@@
# map /toroid to CGI script irspy-toroid.cgi
ScriptAlias /toroid/records /home/indexdata/irspy-toroid/irspy-toroid.cgi
# 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/
# legacy ruby daemon
#ProxyPass /toroid/ http://localhost:12367/
#ProxyPassReverse /toroid/ http://localhost:12367/
@@
-62,6
+69,5
@@
AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml
SetOutputFilter DEFLATE
</Location>
AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml
SetOutputFilter DEFLATE
</Location>
-
</VirtualHost>
</VirtualHost>