aboutsummaryrefslogtreecommitdiffstats
path: root/docs/running
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-08-22 13:53:52 +0100
committerGareth Rees <gareth@mysociety.org>2014-08-22 13:53:52 +0100
commiteaf7e620d500637c7e21aa3245333a05770addd5 (patch)
treebd2f7193b3ab6263489560593e1aad905072be23 /docs/running
parent66e6ab8f647db2f6bbec04907577458a9687362f (diff)
parent9b96f35a7975004bc415c02e702663b70a43b675 (diff)
Merge remote-tracking branch 'origin/gh-pages-thin-documentation-gr' into gh-pages
Diffstat (limited to 'docs/running')
-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