From 4e7cab9f1727eccd90780d1ceb14948e0ace36a6 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 15 Jul 2015 22:03:53 +0000 Subject: doc: remove references to old servers They'll continue to be maintained, but we're no longer advertising them. Also, favor lowercase "unicorn" while we're at it since that matches the executable and gem name to avoid unnecessary escaping for RDoc. --- examples/nginx.conf | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'examples') diff --git a/examples/nginx.conf b/examples/nginx.conf index a68fe6f..0583c1f 100644 --- a/examples/nginx.conf +++ b/examples/nginx.conf @@ -1,5 +1,5 @@ # This is example contains the bare mininum to get nginx going with -# Unicorn or Rainbows! servers. Generally these configuration settings +# unicorn servers. Generally these configuration settings # are applicable to other HTTP application servers (and not just Ruby # ones), so if you have one working well for proxying another app # server, feel free to continue using it. @@ -44,8 +44,8 @@ http { # click tracking! access_log /path/to/nginx.access.log combined; - # you generally want to serve static files with nginx since neither - # Unicorn nor Rainbows! is optimized for it at the moment + # you generally want to serve static files with nginx since + # unicorn is not and will never be optimized for it sendfile on; tcp_nopush on; # off may be better for *some* Comet/long-poll stuff @@ -67,10 +67,10 @@ http { text/javascript application/x-javascript application/atom+xml; - # this can be any application server, not just Unicorn/Rainbows! + # this can be any application server, not just unicorn upstream app_server { # fail_timeout=0 means we always retry an upstream even if it failed - # to return a good HTTP response (in case the Unicorn master nukes a + # to return a good HTTP response (in case the unicorn master nukes a # single worker for timing out). # for UNIX domain socket setups: @@ -132,12 +132,11 @@ http { # redirects, we set the Host: header above already. proxy_redirect off; - # set "proxy_buffering off" *only* for Rainbows! when doing - # Comet/long-poll/streaming. It's also safe to set if you're using - # only serving fast clients with Unicorn + nginx, but not slow - # clients. You normally want nginx to buffer responses to slow - # clients, even with Rails 3.1 streaming because otherwise a slow - # client can become a bottleneck of Unicorn. + # It's also safe to set if you're using only serving fast clients + # with unicorn + nginx, but not slow clients. You normally want + # nginx to buffer responses to slow clients, even with Rails 3.1 + # streaming because otherwise a slow client can become a bottleneck + # of unicorn. # # The Rack application may also set "X-Accel-Buffering (yes|no)" # in the response headers do disable/enable buffering on a -- cgit v1.2.3-24-ge0c7