diff --git a/config/nginx.auth.conf b/config/nginx.auth.conf index 78f03ae..ca53c01 100644 --- a/config/nginx.auth.conf +++ b/config/nginx.auth.conf @@ -31,17 +31,6 @@ server { gzip_disable "msie6"; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - proxy_redirect off; - proxy_set_header X-Original-URI $request_uri; - proxy_set_header X-Original-Remote-Addr $remote_addr; - proxy_set_header X-Original-Host $host; - - error_page 401 /login; @@ -66,6 +55,12 @@ server { location / { proxy_pass http://app; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + auth_request /auth; auth_request_set $auth_cookie $upstream_http_set_cookie; add_header Set-Cookie $auth_cookie; diff --git a/config/nginx.off.conf b/config/nginx.off.conf index d2e0e2c..3fe7d9a 100644 --- a/config/nginx.off.conf +++ b/config/nginx.off.conf @@ -1,43 +1,37 @@ upstream app { - server $APPLICATION; + server $APPLICATION; } - include /etc/nginx/include/upstream.conf; + include /etc/nginx/include/upstream.conf; server { - listen 80; - include /etc/nginx/mime.types; - - gzip on; - gzip_min_length 1000; - gzip_proxied any; - gzip_comp_level 1; - gzip_types text/css text/javascript text/xml text/plain text/x-component application/javascript application/json application/xml application/rss+xml font/truetype font/opentype application/vnd.ms-fontobject image/svg+xml; - gzip_vary on; - gzip_disable "msie6"; - - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - proxy_redirect off; - proxy_set_header X-Original-URI $request_uri; - proxy_set_header X-Original-Remote-Addr $remote_addr; - proxy_set_header X-Original-Host $host; + listen 80; + include /etc/nginx/mime.types; + gzip on; + gzip_min_length 1000; + gzip_proxied any; + gzip_comp_level 1; + gzip_types text/css text/javascript text/xml text/plain text/x-component application/javascript application/json application/xml application/rss+xml font/truetype font/opentype application/vnd.ms-fontobject image/svg+xml; + gzip_vary on; + gzip_disable "msie6"; location / { - proxy_pass http://app; + proxy_pass http://app; + + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; } location = /health { - access_log off; - add_header 'Content-Type' 'application/json'; - return 200 'UP'; + access_log off; + add_header 'Content-Type' 'application/json'; + return 200 'UP'; } include /etc/nginx/include/location.conf;