diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-08-22 13:53:52 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-08-22 13:53:52 +0100 |
| commit | eaf7e620d500637c7e21aa3245333a05770addd5 (patch) | |
| tree | bd2f7193b3ab6263489560593e1aad905072be23 /docs/installing | |
| parent | 66e6ab8f647db2f6bbec04907577458a9687362f (diff) | |
| parent | 9b96f35a7975004bc415c02e702663b70a43b675 (diff) | |
Merge remote-tracking branch 'origin/gh-pages-thin-documentation-gr' into gh-pages
Diffstat (limited to 'docs/installing')
| -rw-r--r-- | docs/installing/deploy.md | 3 | ||||
| -rw-r--r-- | docs/installing/manual_install.md | 2 |
2 files changed, 3 insertions, 2 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: |