diff options
| author | francis <francis> | 2009-07-15 09:06:37 +0000 |
|---|---|---|
| committer | francis <francis> | 2009-07-15 09:06:37 +0000 |
| commit | a2bf24ad9fc33fcd2739466f61e3b73ccd5ebeb0 (patch) | |
| tree | 9d18d8a6fb1b5dc23b94ca32dd3ee09c3d55ab7b | |
| parent | e26befd78ab29e7fda5197a6bf7b0dc73addb910 (diff) | |
Use Passenger instead of Mongrel
| -rw-r--r-- | config/httpd.conf | 47 | ||||
| -rw-r--r-- | config/packages | 2 |
2 files changed, 25 insertions, 24 deletions
diff --git a/config/httpd.conf b/config/httpd.conf index 56d1b18bf..2aca05712 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org # -# $Id: httpd.conf,v 1.26 2009-07-14 23:03:03 francis Exp $ +# $Id: httpd.conf,v 1.27 2009-07-15 09:06:37 francis Exp $ # This is needed for the PHP spell checker <Location /fcgi> @@ -48,27 +48,28 @@ RewriteRule /down.html / [R] SetHandler balancer-manager </Location> -<Proxy balancer://foicluster> -# If adding new ones, launch extra mongrels in foimongreld.ugly also -BalancerMember http://localhost:3000 -BalancerMember http://localhost:3001 -BalancerMember http://localhost:3002 -BalancerMember http://localhost:3003 -BalancerMember http://localhost:3004 -BalancerMember http://localhost:3005 -BalancerMember http://localhost:3006 -BalancerMember http://localhost:3007 -# really should be lbmethod=bybusyness, but we don't have that algorithm yet. -# If it becomes a problem, upgrade or patch Apache with it. See: -# see http://labs.reevoo.com/2008/8/19/bybusy-mod-accepted-by-apache -ProxySet lbmethod=byrequests -</Proxy> -ProxyPass /jslib ! -ProxyPass /fcgi ! -ProxyPass /files ! -ProxyPass /down ! -ProxyPass /down.html ! -ProxyPass /admin/balancer-manager ! -ProxyPass / balancer://foicluster/ +# Configuration for proxying to mongrel using foimongreld.ugly +#<Proxy balancer://foicluster> +## If adding new ones, launch extra mongrels in foimongreld.ugly also +#BalancerMember http://localhost:3000 +#BalancerMember http://localhost:3001 +#BalancerMember http://localhost:3002 +#BalancerMember http://localhost:3003 +#BalancerMember http://localhost:3004 +#BalancerMember http://localhost:3005 +#BalancerMember http://localhost:3006 +#BalancerMember http://localhost:3007 +## really should be lbmethod=bybusyness, but we don't have that algorithm yet. +## If it becomes a problem, upgrade or patch Apache with it. See: +## see http://labs.reevoo.com/2008/8/19/bybusy-mod-accepted-by-apache +#ProxySet lbmethod=byrequests +#</Proxy> +#ProxyPass /jslib ! +#ProxyPass /fcgi ! +#ProxyPass /files ! +#ProxyPass /down ! +#ProxyPass /down.html ! +#ProxyPass /admin/balancer-manager ! +#ProxyPass / balancer://foicluster/ diff --git a/config/packages b/config/packages index ea09267a7..36701f613 100644 --- a/config/packages +++ b/config/packages @@ -4,7 +4,6 @@ libgems-ruby1.8 libopenssl-ruby1.8 rake irb -mongrel wv poppler-utils gs-gpl @@ -20,3 +19,4 @@ libzip-ruby1.8 libzlib-ruby mahoro-ruby1.8 wdg-html-validator +libapache2-mod-passenger |