aboutsummaryrefslogtreecommitdiffstats
path: root/docs/running/server.md
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-08-22 14:25:56 +0100
committerLouise Crow <louise.crow@gmail.com>2014-08-22 14:25:56 +0100
commit9cd8ddead67a114f7c2cfea7484396bea08b7b63 (patch)
tree562477d22d310a38f88a4eadb7ab87757d46f9dd /docs/running/server.md
parentc9234c473c22aa2f909e7b30d82f195186ef0ed3 (diff)
parenteaf7e620d500637c7e21aa3245333a05770addd5 (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.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/running/server.md b/docs/running/server.md
index 1de0ce595..da1312ac3 100644
--- a/docs/running/server.md
+++ b/docs/running/server.md
@@ -31,7 +31,9 @@ Don't forget to set up the cron jobs as outlined in the
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