Merge pull request #1924 from loafoe/master

[#1923] Make Websocket ports configurable

utils/config.go

@@ -223,5 +223,8 @@ func getClientConfig(c *model.Config) map[string]string {
 
 	props["EnableLdap"] = strconv.FormatBool(*c.LdapSettings.Enable)
 
+	props["WebsocketPort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketPort)
+	props["WebsocketSecurePort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketSecurePort)
+
 	return props
 }