diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-17 12:04:51 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-17 12:04:51 -0400 |
| commit | a6a9dd76914b33d292a54d667ce6789c2b6b4b41 (patch) | |
| tree | a3a358fbb7cb8b272ce846965430276a4717ebfd /model | |
| parent | 1fe2f7301a03f1051245fc38492c2ad4f5357de3 (diff) | |
| parent | fdc3207724fde8c0c3fae7e18d7ec8463e72e737 (diff) | |
| download | chat-a6a9dd76914b33d292a54d667ce6789c2b6b4b41.tar.gz chat-a6a9dd76914b33d292a54d667ce6789c2b6b4b41.tar.bz2 chat-a6a9dd76914b33d292a54d667ce6789c2b6b4b41.zip | |
Merge pull request #2462 from mattermost/plt-2340
PLT-2340 Webpack optimizations and fixes
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index 82c51224e..11ce260ee 100644 --- a/model/config.go +++ b/model/config.go @@ -21,6 +21,10 @@ const ( SERVICE_GITLAB = "gitlab" SERVICE_GOOGLE = "google" + + WEBSERVER_MODE_REGULAR = "regular" + WEBSERVER_MODE_GZIP = "gzip" + WEBSERVER_MODE_DISABLED = "disabled" ) type ServiceSettings struct { @@ -46,6 +50,7 @@ type ServiceSettings struct { SessionCacheInMinutes *int WebsocketSecurePort *int WebsocketPort *int + WebserverMode *string } type SSOSettings struct { @@ -383,6 +388,11 @@ func (o *Config) SetDefaults() { o.ServiceSettings.AllowCorsFrom = new(string) *o.ServiceSettings.AllowCorsFrom = "" } + + if o.ServiceSettings.WebserverMode == nil { + o.ServiceSettings.WebserverMode = new(string) + *o.ServiceSettings.WebserverMode = "regular" + } } func (o *Config) IsValid() *AppError { |