From 511706b873a7c0b7ac10e31a0186546e1fb691eb Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 12 Nov 2016 16:18:24 +0100 Subject: [PATCH] Improved / location with proxy_read_timeout from 60 sec. to 180 sec. Improved indentation. --- contrib/nginx/zammad.conf | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/contrib/nginx/zammad.conf b/contrib/nginx/zammad.conf index 82996d597..46f06961a 100644 --- a/contrib/nginx/zammad.conf +++ b/contrib/nginx/zammad.conf @@ -12,9 +12,9 @@ upstream zammad-websocket { server { listen 80; - + server_name localhost; - + root /opt/zammad/public; access_log /var/log/nginx/zammad.access.log; @@ -27,23 +27,24 @@ server { } location /ws { - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header CLIENT_IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_read_timeout 86400; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header CLIENT_IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_read_timeout 86400; proxy_pass http://zammad-websocket; } location / { - proxy_set_header Host $http_host; - proxy_set_header CLIENT_IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header CLIENT_IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_read_timeout 180; proxy_pass http://zammad; - gzip on; - gzip_types text/plain text/xml text/css image/svg+xml application/javascript application/x-javascript application/json application/xml; - gzip_proxied any; + gzip on; + gzip_types text/plain text/xml text/css image/svg+xml application/javascript application/x-javascript application/json application/xml; + gzip_proxied any; } }