Merge pull request #1924 from loafoe/master

[#1923] Make Websocket ports configurable

model/config.go

@@ -40,6 +40,8 @@ type ServiceSettings struct {
 	SessionLengthMobileInDays  *int
 	SessionLengthSSOInDays     *int
 	SessionCacheInMinutes      *int
+	WebsocketSecurePort        *int
+	WebsocketPort              *int
 }
 
 type SSOSettings struct {
@@ -330,6 +332,14 @@ func (o *Config) SetDefaults() {
 		o.ServiceSettings.SessionCacheInMinutes = new(int)
 		*o.ServiceSettings.SessionCacheInMinutes = 10
 	}
+	if o.ServiceSettings.WebsocketPort == nil {
+		o.ServiceSettings.WebsocketPort = new(int)
+		*o.ServiceSettings.WebsocketPort = 80
+	}
+	if o.ServiceSettings.WebsocketSecurePort == nil {
+		o.ServiceSettings.WebsocketSecurePort = new(int)
+		*o.ServiceSettings.WebsocketSecurePort = 443
+	}
 }
 
 func (o *Config) IsValid() *AppError {