LP1834208 Removing apache2-websockets

[opensrf-equinox.git] / examples / nginx / osrf-ws-http-proxy

diff --git a/examples/nginx/osrf-ws-http-proxy b/examples/nginx/osrf-ws-http-proxy
index db2e6e2..5d5b45e 100644 (file)
--- a/examples/nginx/osrf-ws-http-proxy
+++ b/examples/nginx/osrf-ws-http-proxy
@@ -64,14 +64,9 @@ server {
 
     location /osrf-websocket-translator {
 
-        # apache2-websockets:
-        # Defaults to HTTPS with or without a proxy.
-        proxy_pass https://localhost:7682;
-
-        # websocketd:
         # websocketd may be run with or without SSL.  When used with
         # NGINX, the assumption is it runs w/o SSL.  Change to taste.
-        #proxy_pass http://localhost:7682;
+        proxy_pass http://localhost:7682;
 
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -81,20 +76,15 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
 
-        proxy_connect_timeout 5m;
-
-        # apache2-websockets:
-        # Raise the default nginx proxy timeout settings to
-        # an arbitrarily high value so that we can leverage
-        # osrf-websocket-translator's native timeout settings.
-        proxy_send_timeout 1h;
-        proxy_read_timeout 1h;
+        # Disconnect the client if it takes this long to connect to
+        # websocketd.
+        proxy_connect_timeout 1m;
 
-        # websocketd:
-        # websocketd connections persist indefinitely. Leverage nginx
-        # timeouts to periodically disconnect long-idle clients.
-        #proxy_send_timeout 5m;
-        #proxy_read_timeout 5m;
+        # websocketd connections persist indefinitely. Leverage 
+        # nginx timeouts to disconnect idle clients.  Change
+        # to taste.
+        proxy_send_timeout 3m;
+        proxy_read_timeout 3m;
     }
 }