From 75d9a3a3b99d0acafb6783a721a35ab1ccdd8d9d Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 20 Feb 2018 12:49:45 -0800 Subject: MM-8681 Adding config settings necessary for using CloudFront. (#8307) * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics. --- utils/config.go | 1 + 1 file changed, 1 insertion(+) (limited to 'utils/config.go') diff --git a/utils/config.go b/utils/config.go index a855733a7..0d3047c5d 100644 --- a/utils/config.go +++ b/utils/config.go @@ -353,6 +353,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["BuildEnterpriseReady"] = model.BuildEnterpriseReady props["SiteURL"] = strings.TrimRight(*c.ServiceSettings.SiteURL, "/") + props["WebsocketURL"] = strings.TrimRight(*c.ServiceSettings.WebsocketURL, "/") props["SiteName"] = c.TeamSettings.SiteName props["EnableTeamCreation"] = strconv.FormatBool(c.TeamSettings.EnableTeamCreation) props["EnableUserCreation"] = strconv.FormatBool(c.TeamSettings.EnableUserCreation) -- cgit v1.2.3-1-g7c22 From d44ef7ea67324072f3fbf1230c77f0ee0b4ac8bd Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 22 Feb 2018 18:23:32 -0600 Subject: Remove global site url (#8343) * remove global site url * missed one * revert mysterious change --- utils/config.go | 9 --------- 1 file changed, 9 deletions(-) (limited to 'utils/config.go') diff --git a/utils/config.go b/utils/config.go index 0d3047c5d..afb2e758c 100644 --- a/utils/config.go +++ b/utils/config.go @@ -34,15 +34,6 @@ const ( ) var originalDisableDebugLvl l4g.Level = l4g.DEBUG -var siteURL = "" - -func GetSiteURL() string { - return siteURL -} - -func SetSiteURL(url string) { - siteURL = strings.TrimRight(url, "/") -} // FindConfigFile attempts to find an existing configuration file. fileName can be an absolute or // relative path or name such as "/opt/mattermost/config.json" or simply "config.json". An empty -- cgit v1.2.3-1-g7c22 From 5fb4b1bc935bd273990779e1d4a680a563784df8 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 23 Feb 2018 10:55:02 -0500 Subject: MM-8593 Default APIv3 to disabled for new installs (#8353) * Default APIv3 to disabled for new installs * Add EnableAPIv3 setting to client config * Enable APIv3 for needed tests --- utils/config.go | 1 + 1 file changed, 1 insertion(+) (limited to 'utils/config.go') diff --git a/utils/config.go b/utils/config.go index afb2e758c..679e5f62c 100644 --- a/utils/config.go +++ b/utils/config.go @@ -346,6 +346,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["SiteURL"] = strings.TrimRight(*c.ServiceSettings.SiteURL, "/") props["WebsocketURL"] = strings.TrimRight(*c.ServiceSettings.WebsocketURL, "/") props["SiteName"] = c.TeamSettings.SiteName + props["EnableAPIv3"] = strconv.FormatBool(*c.ServiceSettings.EnableAPIv3) props["EnableTeamCreation"] = strconv.FormatBool(c.TeamSettings.EnableTeamCreation) props["EnableUserCreation"] = strconv.FormatBool(c.TeamSettings.EnableUserCreation) props["EnableOpenServer"] = strconv.FormatBool(*c.TeamSettings.EnableOpenServer) -- cgit v1.2.3-1-g7c22