aboutsummaryrefslogtreecommitdiffstats
path: root/docs/running/server.md
diff options
context:
space:
mode:
authorMartin Wright <martin@mynameismartin.com>2015-04-07 14:46:11 +0100
committerMartin Wright <martin@mynameismartin.com>2015-04-07 14:46:11 +0100
commit270606788ba97b9c509183a06cdefe3b83f07464 (patch)
tree3304ea68b1e5cfecc2518aa6effa643175e12fdd /docs/running/server.md
parent970396737e03ec2336f0ecc34d07047d83ff2629 (diff)
parent6cc59ede7bca866f7e56c771cc12ca1afa9406ef (diff)
Merge branch 'gh-pages' of ssh://git.mysociety.org/data/git/public/alaveteli into gh-pages
Diffstat (limited to 'docs/running/server.md')
-rw-r--r--docs/running/server.md8
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/running/server.md b/docs/running/server.md
index c10d4b4b4..da1312ac3 100644
--- a/docs/running/server.md
+++ b/docs/running/server.md
@@ -26,16 +26,14 @@ ask us about hosting.
Don't forget to set up the cron jobs as outlined in the
[installation instructions]({{ site.baseurl }}docs/installing/manual_install/).
-As of October 2011, they rely on a small program created by mySociety called
-`run-with-lockfile`. A discussion of where the source for this can be found,
-and possible alternatives, lives in
-[Alaveteli issue #112](https://github.com/mysociety/alaveteli/issues/112).
## Webserver configuration
We recommend running your site behind
[Apache](https://httpd.apache.org) +
-[Passenger](https://www.phusionpassenger.com). Refer to the
+[Passenger](https://www.phusionpassenger.com) or [Nginx](http://wiki.nginx.org/Main) + [Thin](http://code.macournoyer.com/thin/).
+
+If you're using Passenger, refer to the
[installation instructions]({{ site.baseurl }}docs/installing/manual_install/)
regarding `PassengerMaxPoolSize`, which you should
experiment with to match your available RAM. It is very unlikely that you'll