aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-07-31 15:48:36 +0100
committerGareth Rees <gareth@mysociety.org>2014-08-22 11:23:48 +0100
commit16405b8e8ce61e68af694d6a0653cbbc6e305906 (patch)
treee439c30634a85e3a57a45dd3eeb973224c6589dd
parent21cc4b54efdba64fe6e03332aad1941cebad68dc (diff)
Extend references to Passenger and Apache to mention Thin and Nginx
-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