From 219f4e36e5c78982317a85e8a49cda74562d6b65 Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Mon, 17 Oct 2016 06:50:41 -0700
Subject: Bumping up the defaults (#4229)

---
 config/config.json | 4 ++--
 model/config.go    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/config.json b/config/config.json
index e96a9b237..8b5a8576f 100644
--- a/config/config.json
+++ b/config/config.json
@@ -8,8 +8,8 @@
         "UseLetsEncrypt": false,
         "LetsEncryptCertificateCacheFile": "./config/letsencrypt.cache",
         "Forward80To443": false,
-        "ReadTimeout": 30,
-        "WriteTimeout": 60,
+        "ReadTimeout": 300,
+        "WriteTimeout": 300,
         "MaximumLoginAttempts": 10,
         "SegmentDeveloperKey": "",
         "GoogleDeveloperKey": "",
diff --git a/model/config.go b/model/config.go
index 12f833b89..8d49434f6 100644
--- a/model/config.go
+++ b/model/config.go
@@ -940,12 +940,12 @@ func (o *Config) SetDefaults() {
 
 	if o.ServiceSettings.ReadTimeout == nil {
 		o.ServiceSettings.ReadTimeout = new(int)
-		*o.ServiceSettings.ReadTimeout = 30
+		*o.ServiceSettings.ReadTimeout = 300
 	}
 
 	if o.ServiceSettings.WriteTimeout == nil {
 		o.ServiceSettings.WriteTimeout = new(int)
-		*o.ServiceSettings.WriteTimeout = 60
+		*o.ServiceSettings.WriteTimeout = 300
 	}
 
 	if o.ServiceSettings.Forward80To443 == nil {
-- 
cgit v1.2.3-1-g7c22