From 68765a8f21db8a1b732f26f5bc1bf0e1a8e52d8f Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 30 Nov 2015 22:38:38 -0800
Subject: PLT-902 switching to push proxy server

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

(limited to 'model/config.go')

diff --git a/model/config.go b/model/config.go
index 50a8dc133..195cefae8 100644
--- a/model/config.go
+++ b/model/config.go
@@ -96,11 +96,8 @@ type EmailSettings struct {
 	ConnectionSecurity       string
 	InviteSalt               string
 	PasswordResetSalt        string
-
-	// For Future Use
-	ApplePushServer      string
-	ApplePushCertPublic  string
-	ApplePushCertPrivate string
+	SendPushNotifications    *bool
+	PushNotificationServer   *string
 }
 
 type RateLimitSettings struct {
@@ -181,6 +178,17 @@ func (o *Config) SetDefaults() {
 		o.TeamSettings.EnableTeamListing = new(bool)
 		*o.TeamSettings.EnableTeamListing = false
 	}
+
+	if o.EmailSettings.SendPushNotifications == nil {
+		o.EmailSettings.SendPushNotifications = new(bool)
+		*o.EmailSettings.SendPushNotifications = true
+	}
+
+	if o.EmailSettings.PushNotificationServer == nil {
+		o.EmailSettings.PushNotificationServer = new(string)
+		*o.EmailSettings.PushNotificationServer = "https://push.mattermost.com"
+	}
+
 }
 
 func (o *Config) IsValid() *AppError {
-- 
cgit v1.2.3-1-g7c22