diff options
| -rw-r--r-- | docs/installing/deploy.md | 3 | ||||
| -rw-r--r-- | docs/installing/manual_install.md | 2 | ||||
| -rw-r--r-- | docs/running/server.md | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/docs/installing/deploy.md b/docs/installing/deploy.md index 64ecde088..a0a4c0abb 100644 --- a/docs/installing/deploy.md +++ b/docs/installing/deploy.md @@ -92,7 +92,8 @@ Next, on your local machine: server. Also, change `deploy_to` to be the path where Alaveteli is currently installed on the server -- if you used the installation script , this will be `/var/www/[HOST or alaveteli]/alaveteli`. If - you're running the thin application server rather than passenger, + you're running the thin application server rather than passenger (you + will be if you installed using the install script), you'll need to set `rails_app_server` to `thin` and `rails_app_port` to whatever port it's running on. If you installed with the install script, this will be port 3300. diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index 84338a5c4..64875e3ab 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -423,7 +423,7 @@ See later in the guide for configuring the Apache web server with Passenger. ### Using Thin Thin is a lighter-weight application server which can be run independently of -a web server. +a web server. Thin will be installed in the application bundle and used to run Alaveteli by default. Run the following to get the server running: 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 |