Increase origin timeouts to 3m (#497)

* Increase origin timeouts to 3m

* Fix

* Fix

Author: hweawer

nginx/config/origin.go

@@ -28,6 +28,9 @@ server {
   gzip on;
   gzip_types text/plain test/csv application/json;
 
+  # Committing large blobs might take a while.
+  proxy_read_timeout {{.proxy_read_timeout}};
+
 {{healthEndpoint .server}}
 
   location / {

nginx/nginx.go

@@ -55,6 +55,9 @@ type Config struct {
 	AccessLogPath string `yaml:"access_log_path"`
 	ErrorLogPath  string `yaml:"error_log_path"`
 
+	// ProxyTimeout defines the proxy_read_timeout for nginx (e.g. "15m", "3m", "60s")
+	ProxyTimeout string `yaml:"proxy_timeout"`
+
 	tls httputil.TLSConfig
 }
 
@@ -80,6 +83,9 @@ func (c *Config) applyDefaults() error {
 		}
 		c.ErrorLogPath = filepath.Join(c.LogDir, "nginx-error.log")
 	}
+	if c.ProxyTimeout == "" {
+		c.ProxyTimeout = "3m"
+	}
 	return nil
 }
 
@@ -120,6 +126,10 @@ func (c *Config) Build(params map[string]interface{}) ([]byte, error) {
 	if _, ok := params["client_verification"]; !ok {
 		params["client_verification"] = config.DefaultClientVerification
 	}
+	// Add proxy_read_timeout to params for site template
+	if _, ok := params["proxy_read_timeout"]; !ok {
+		params["proxy_read_timeout"] = c.ProxyTimeout
+	}
 	site, err := populateTemplate(tmpl, params)
 	if err != nil {
 		return nil, fmt.Errorf("populate template: %s", err)