aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2009-07-14 12:02:54 +0000
committerfrancis <francis>2009-07-14 12:02:54 +0000
commiteca23f0c98ca0b66fefd855002ad9f9a7f6d9ee2 (patch)
tree1abf139cd84c55226ad59535567f79b53931df84
parent2bfaea0adc740b573b25cf192e99863d10f714d4 (diff)
And change Apache config to use more mongrels.
-rw-r--r--config/foimongreld.ugly3
-rw-r--r--config/httpd.conf6
2 files changed, 7 insertions, 2 deletions
diff --git a/config/foimongreld.ugly b/config/foimongreld.ugly
index f67b732e8..2eb7aa5c4 100644
--- a/config/foimongreld.ugly
+++ b/config/foimongreld.ugly
@@ -7,7 +7,8 @@ RUNDIR=/data/vhost/!!(*= $vhost *)!!/mysociety/foi
PIDDIR=/data/vhost/!!(*= $vhost *)!!/mysociety/foi/log
DUSER=!!(*= $user *)!!
-# number of ports = number of instances - also need to change Apache config though.
+# number of ports = number of instances - also need to change config/httpd.conf
+# to actually use the new mongrels.
PORTS="3000 3001 3002 3003 3004 3005 3006 3007"
function stop_mongrels {
diff --git a/config/httpd.conf b/config/httpd.conf
index 03c200841..cc9dc20e4 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.23 2009-03-18 05:14:26 francis Exp $
+# $Id: httpd.conf,v 1.24 2009-07-14 12:02:54 francis Exp $
# This is needed for the PHP spell checker
<Location /fcgi>
@@ -49,11 +49,15 @@ RewriteRule /down.html / [R]
</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