From e78c79b83213efc40bffc5ef42071fedb85d6061 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 21 Sep 2015 19:01:52 -0700
Subject: Adding rate limiter settings to the admin console

---
 model/config.go | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'model/config.go')

diff --git a/model/config.go b/model/config.go
index 3c0ada423..d4eb1e714 100644
--- a/model/config.go
+++ b/model/config.go
@@ -30,6 +30,8 @@ type ServiceSettings struct {
 	AnalyticsUrl               string
 	AllowedLoginAttempts       int
 	EnableOAuthServiceProvider bool
+	SegmentDeveloperKey        string
+	GoogleDeveloperKey         string
 }
 
 type SSOSetting struct {
@@ -96,11 +98,11 @@ type EmailSettings struct {
 }
 
 type RateLimitSettings struct {
-	UseRateLimiter   bool
-	PerSec           int
-	MemoryStoreSize  int
-	VaryByRemoteAddr bool
-	VaryByHeader     string
+	EnableRateLimiter bool
+	PerSec            int
+	MemoryStoreSize   int
+	VaryByRemoteAddr  bool
+	VaryByHeader      string
 }
 
 type PrivacySettings struct {
@@ -108,11 +110,6 @@ type PrivacySettings struct {
 	ShowFullName     bool
 }
 
-type ClientSettings struct {
-	SegmentDeveloperKey string
-	GoogleDeveloperKey  string
-}
-
 type TeamSettings struct {
 	MaxUsersPerTeam           int
 	AllowPublicLink           bool
@@ -124,15 +121,14 @@ type TeamSettings struct {
 }
 
 type Config struct {
-	LogSettings       LogSettings
 	ServiceSettings   ServiceSettings
+	TeamSettings      TeamSettings
 	SqlSettings       SqlSettings
+	LogSettings       LogSettings
 	ImageSettings     ImageSettings
 	EmailSettings     EmailSettings
 	RateLimitSettings RateLimitSettings
 	PrivacySettings   PrivacySettings
-	ClientSettings    ClientSettings
-	TeamSettings      TeamSettings
 	SSOSettings       map[string]SSOSetting
 }
 
-- 
cgit v1.2.3-1-g7c22