feat(nginx/config): allow overwrite of proxy_read_timeout through yaml (#615)

Author: Anton-Kalpakchiev

nginx/config/agent.go

@@ -37,6 +37,8 @@ server {
   access_log {{.access_log_path}};
   error_log {{.error_log_path}};
 
+  proxy_read_timeout {{if .proxy_read_timeout}}{{.proxy_read_timeout}}{{else}}10m{{end}};
+
   gzip on;
   gzip_types text/plain test/csv application/json;
 

nginx/config/build-index.go

@@ -50,7 +50,7 @@ server {
     proxy_cache_valid   any 1s;
     proxy_cache_lock    on;
 
-    proxy_read_timeout {{.proxy_read_timeout}};
+    proxy_read_timeout {{if .proxy_read_timeout}}{{.proxy_read_timeout}}{{else}}3m{{end}};
   }
 
   location ~* ^/repositories/.*/tags$ {
@@ -71,7 +71,7 @@ server {
     proxy_cache_valid   any 1s;
     proxy_cache_lock    on;
 
-    proxy_read_timeout {{.proxy_read_timeout}};
+    proxy_read_timeout {{if .proxy_read_timeout}}{{.proxy_read_timeout}}{{else}}3m{{end}};
   }
 }
 `

nginx/config/origin.go

@@ -29,7 +29,7 @@ server {
   gzip_types text/plain test/csv application/json;
 
   # Committing large blobs might take a while.
-  proxy_read_timeout {{.proxy_read_timeout}};
+  proxy_read_timeout {{if .proxy_read_timeout}}{{.proxy_read_timeout}}{{else}}3m{{end}};
 
   proxy_set_header traceparent $http_traceparent;
   proxy_set_header tracestate $http_tracestate;

nginx/config/proxy.go

@@ -42,7 +42,7 @@ server {
   gzip_types text/plain test/csv application/json;
 
   # Committing large blobs might take a while.
-  proxy_read_timeout 3m;
+  proxy_read_timeout {{if $.proxy_read_timeout}}{{$.proxy_read_timeout}}{{else}}3m{{end}};
 
 {{healthEndpoint "proxy-server"}}
 

nginx/config/tracker.go

@@ -29,6 +29,8 @@ server {
   access_log {{.access_log_path}};
   error_log {{.error_log_path}};
 
+  proxy_read_timeout {{if .proxy_read_timeout}}{{.proxy_read_timeout}}{{else}}60s{{end}};
+
 {{healthEndpoint "tracker"}}
 
   location / {

nginx/nginx.go

@@ -84,9 +84,6 @@ func (c *Config) applyDefaults() error {
 		}
 		c.ErrorLogPath = filepath.Join(c.LogDir, "nginx-error.log")
 	}
-	if c.ProxyTimeout == "" {
-		c.ProxyTimeout = "3m"
-	}
 	return nil
 }