diff options
| author | Corey Hulen <corey@hulen.com> | 2015-12-01 08:33:23 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-12-01 08:33:23 -0800 |
| commit | e460bc2665ea3af927055f30727cb97952e64313 (patch) | |
| tree | c3e98a2ca7c5d8ebf2ac298ef846734c1dc29a45 /model/config.go | |
| parent | 62c96514bfa243029dba2d9b47b5b8a8322059e4 (diff) | |
| parent | f5907e21cad055b241718d2bd1530bd4c22e77c7 (diff) | |
| download | chat-e460bc2665ea3af927055f30727cb97952e64313.tar.gz chat-e460bc2665ea3af927055f30727cb97952e64313.tar.bz2 chat-e460bc2665ea3af927055f30727cb97952e64313.zip | |
Merge pull request #1555 from mattermost/PLT-902
PLT-902 switching to push proxy server
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 18 |
1 files changed, 13 insertions, 5 deletions
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 { |