From 14805afe43b789b2f63807126ddb839c24565cb1 Mon Sep 17 00:00:00 2001 From: Arturo Seijas Date: Thu, 18 Apr 2024 09:35:46 +0200 Subject: [PATCH 1/6] Increase nginx timeout to 300s --- nginx_rock/etc/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx_rock/etc/nginx.conf b/nginx_rock/etc/nginx.conf index 9229cf3f..d2882b88 100644 --- a/nginx_rock/etc/nginx.conf +++ b/nginx_rock/etc/nginx.conf @@ -72,6 +72,7 @@ http { add_header Cache-Control 'no-cache,private'; include common_headers.conf; client_max_body_size 0; + proxy_read_timeout 300; proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; proxy_set_header X-Forwarded-Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From f6356e36a0b9826113cbf4b1103ea51746ad0399 Mon Sep 17 00:00:00 2001 From: Arturo Seijas Date: Thu, 18 Apr 2024 10:34:23 +0200 Subject: [PATCH 2/6] Adjust prod events timeout --- nginx_rock/etc/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx_rock/etc/nginx.conf b/nginx_rock/etc/nginx.conf index d2882b88..911a7b71 100644 --- a/nginx_rock/etc/nginx.conf +++ b/nginx_rock/etc/nginx.conf @@ -72,7 +72,7 @@ http { add_header Cache-Control 'no-cache,private'; include common_headers.conf; client_max_body_size 0; - proxy_read_timeout 300; + proxy_read_timeout 300s; proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; proxy_set_header X-Forwarded-Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From 4536c8c724891da258dd5519e091bfa9bdd5f919 Mon Sep 17 00:00:00 2001 From: Arturo Seijas Date: Thu, 18 Apr 2024 14:04:37 +0200 Subject: [PATCH 3/6] Increase nginx timeout to 300s --- nginx_rock/etc/nginx.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nginx_rock/etc/nginx.conf b/nginx_rock/etc/nginx.conf index 911a7b71..dc0c8990 100644 --- a/nginx_rock/etc/nginx.conf +++ b/nginx_rock/etc/nginx.conf @@ -72,7 +72,7 @@ http { add_header Cache-Control 'no-cache,private'; include common_headers.conf; client_max_body_size 0; - proxy_read_timeout 300s; + proxy_read_timeout 300; proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; proxy_set_header X-Forwarded-Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -81,7 +81,6 @@ http { location ~ ^/event/[0-9]+/manage/registration/[0-9]+/registrations/(import|email)$ { # add_header and proxy_set_header are inherited from the / location proxy_hide_header Cache-Control; - proxy_read_timeout 300; proxy_pass http://localhost:8081; } From 0f257e5a772997fea7f4e184a91739f4682cc396 Mon Sep 17 00:00:00 2001 From: Arturo Seijas Date: Thu, 18 Apr 2024 15:27:25 +0200 Subject: [PATCH 4/6] Increase nginx timeout to 300s --- nginx_rock/etc/nginx.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nginx_rock/etc/nginx.conf b/nginx_rock/etc/nginx.conf index dc0c8990..06782e29 100644 --- a/nginx_rock/etc/nginx.conf +++ b/nginx_rock/etc/nginx.conf @@ -78,12 +78,6 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://localhost:8081; - location ~ ^/event/[0-9]+/manage/registration/[0-9]+/registrations/(import|email)$ { - # add_header and proxy_set_header are inherited from the / location - proxy_hide_header Cache-Control; - proxy_pass http://localhost:8081; - } - location ~ ^/static/custom/(.*)$ { expires 1m; proxy_hide_header Cache-Control; From 6c75d484d662a9d6a73f281f74e207687844b56a Mon Sep 17 00:00:00 2001 From: Arturo Seijas Date: Fri, 19 Apr 2024 10:07:59 +0200 Subject: [PATCH 5/6] fix nginx conf --- nginx_rock/etc/nginx.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nginx_rock/etc/nginx.conf b/nginx_rock/etc/nginx.conf index 06782e29..dc0c8990 100644 --- a/nginx_rock/etc/nginx.conf +++ b/nginx_rock/etc/nginx.conf @@ -78,6 +78,12 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://localhost:8081; + location ~ ^/event/[0-9]+/manage/registration/[0-9]+/registrations/(import|email)$ { + # add_header and proxy_set_header are inherited from the / location + proxy_hide_header Cache-Control; + proxy_pass http://localhost:8081; + } + location ~ ^/static/custom/(.*)$ { expires 1m; proxy_hide_header Cache-Control; From fc4ef74660de3d7515f4c9fbe08773e6c0a45ee1 Mon Sep 17 00:00:00 2001 From: Arturo Seijas Date: Mon, 22 Apr 2024 09:36:34 +0200 Subject: [PATCH 6/6] fix nginx conf --- nginx_rock/etc/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx_rock/etc/nginx.conf b/nginx_rock/etc/nginx.conf index dc0c8990..5f5ae9fd 100644 --- a/nginx_rock/etc/nginx.conf +++ b/nginx_rock/etc/nginx.conf @@ -72,15 +72,15 @@ http { add_header Cache-Control 'no-cache,private'; include common_headers.conf; client_max_body_size 0; - proxy_read_timeout 300; proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; proxy_set_header X-Forwarded-Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://localhost:8081; - location ~ ^/event/[0-9]+/manage/registration/[0-9]+/registrations/(import|email)$ { + location ~ ^/event/[0-9]+/manage/(.*)$ { # add_header and proxy_set_header are inherited from the / location proxy_hide_header Cache-Control; + proxy_read_timeout 300; proxy_pass http://localhost:8081; }