summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-21 19:01:52 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-21 19:01:52 -0700
commite78c79b83213efc40bffc5ef42071fedb85d6061 (patch)
treea9109f40bc8968c8fe9584b21dd4194d8a49c49c /utils/config.go
parentcae5dbd245f05e9441156a3918ef796d92ecf331 (diff)
downloadchat-e78c79b83213efc40bffc5ef42071fedb85d6061.tar.gz
chat-e78c79b83213efc40bffc5ef42071fedb85d6061.tar.bz2
chat-e78c79b83213efc40bffc5ef42071fedb85d6061.zip
Adding rate limiter settings to the admin console
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/utils/config.go b/utils/config.go
index cef99d7d9..5b7cc7c64 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -176,6 +176,8 @@ func getClientProperties(c *model.Config) map[string]string {
props["SiteName"] = c.ServiceSettings.SiteName
props["AnalyticsUrl"] = c.ServiceSettings.AnalyticsUrl
props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider)
+ props["SegmentDeveloperKey"] = c.ServiceSettings.SegmentDeveloperKey
+ props["GoogleDeveloperKey"] = c.ServiceSettings.GoogleDeveloperKey
props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications)
props["AllowSignUpWithEmail"] = strconv.FormatBool(c.EmailSettings.AllowSignUpWithEmail)
@@ -186,9 +188,6 @@ func getClientProperties(c *model.Config) map[string]string {
props["ShowEmailAddress"] = strconv.FormatBool(c.PrivacySettings.ShowEmailAddress)
props["AllowPublicLink"] = strconv.FormatBool(c.TeamSettings.AllowPublicLink)
- props["SegmentDeveloperKey"] = c.ClientSettings.SegmentDeveloperKey
- props["GoogleDeveloperKey"] = c.ClientSettings.GoogleDeveloperKey
-
props["ProfileHeight"] = fmt.Sprintf("%v", c.ImageSettings.ProfileHeight)
props["ProfileWidth"] = fmt.Sprintf("%v", c.ImageSettings.ProfileWidth)
props["ProfileWidth"] = fmt.Sprintf("%v", c.ImageSettings.ProfileWidth)