diff options
| author | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
| commit | 901acc9703ae58b625b44e7abfd02333b9bab951 (patch) | |
| tree | 1a8fc17a85544bc7b8064874923e2fe6e3f44354 /utils/config.go | |
| parent | 21afaf4bedcad578d4f876bb315d1072ccd296e6 (diff) | |
| parent | 2b3b6051d265edf131d006b2eb14f55284faf1e5 (diff) | |
| download | chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.gz chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.bz2 chat-901acc9703ae58b625b44e7abfd02333b9bab951.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/utils/config.go b/utils/config.go index 10ada1728..b28cf918d 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 @@ -353,8 +344,10 @@ 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["EnableAPIv3"] = strconv.FormatBool(*c.ServiceSettings.EnableAPIv3) props["EnableUserCreation"] = strconv.FormatBool(c.TeamSettings.EnableUserCreation) props["EnableOpenServer"] = strconv.FormatBool(*c.TeamSettings.EnableOpenServer) props["RestrictDirectMessage"] = *c.TeamSettings.RestrictDirectMessage |