diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-21 16:03:21 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-21 16:03:21 -0700 |
| commit | 5afc2abee66cda565f2cb890fe11c3d8e918d882 (patch) | |
| tree | c1c2608af14e488435997fb5c5cfa39788fbbe3d /ci/ci_setup_notes.txt | |
| parent | 696375ac628bd41edf3a8c8c00dde196696f4add (diff) | |
| parent | f49e3441280380ec810d54bd5a77a7e699415efb (diff) | |
| download | rails-5afc2abee66cda565f2cb890fe11c3d8e918d882.tar.gz rails-5afc2abee66cda565f2cb890fe11c3d8e918d882.tar.bz2 rails-5afc2abee66cda565f2cb890fe11c3d8e918d882.zip | |
Merge branch 'master' into cherry
Diffstat (limited to 'ci/ci_setup_notes.txt')
| -rw-r--r-- | ci/ci_setup_notes.txt | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/ci/ci_setup_notes.txt b/ci/ci_setup_notes.txt index b3c5936797..63f1851b19 100644 --- a/ci/ci_setup_notes.txt +++ b/ci/ci_setup_notes.txt @@ -54,12 +54,21 @@ ci ALL=NOPASSWD: /usr/local/bin/geminstaller, /usr/local/bin/ruby, /usr/loc * Install/setup nginx: $ sudo aptitude install nginx $ sudo vi /etc/nginx/sites-available/default +# Add the following entry at the top of the file above the 'server {' line: +upstream mongrel { + server 127.0.0.1:3333; +} + # Change server_name entry to match server name -# comment two lines and add one to proxy to ccrb: -# root /var/www/nginx-default; -# index index.html index.htm; - proxy_pass http://127.0.0.1:3333; +# replace the contents of the root 'location / {}' block with the following entries: + proxy_pass http://mongrel; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Client-Verify SUCCESS; + proxy_read_timeout 65; # also comment default locations for /doc and /images $ sudo /etc/init.d/nginx start |