diff options
| -rw-r--r-- | api/post.go | 1 | ||||
| -rw-r--r-- | config/config.json | 8 | ||||
| -rw-r--r-- | docker/dev/config_docker.json | 6 | ||||
| -rw-r--r-- | docker/local/config_docker.json | 6 | ||||
| -rw-r--r-- | utils/mail.go | 3 |
5 files changed, 19 insertions, 5 deletions
diff --git a/api/post.go b/api/post.go index 6c1d4bbd1..958479427 100644 --- a/api/post.go +++ b/api/post.go @@ -650,6 +650,7 @@ func sendNotificationsAndForget(c *Context, post *model.Post, team *model.Team, httpClient := http.Client{} request, _ := http.NewRequest("POST", *utils.Cfg.EmailSettings.PushNotificationServer+"/api/v1/send_push", strings.NewReader(msg.ToJson())) + l4g.Debug("Sending push notification to " + msg.DeviceId + " with msg of '" + msg.Message + "'") if _, err := httpClient.Do(request); err != nil { l4g.Error("Failed to send push notificationid=%v, err=%v", id, err) } diff --git a/config/config.json b/config/config.json index 5469608f8..7c2ec9426 100644 --- a/config/config.json +++ b/config/config.json @@ -54,7 +54,11 @@ "AmazonS3AccessKeyId": "", "AmazonS3SecretAccessKey": "", "AmazonS3Bucket": "", - "AmazonS3Region": "" + "AmazonS3Region": "", + "AmazonS3Endpoint": "", + "AmazonS3BucketEndpoint": "", + "AmazonS3LocationConstraint": false, + "AmazonS3LowercaseBucket": false }, "EmailSettings": { "EnableSignUpWithEmail": true, @@ -100,4 +104,4 @@ "TokenEndpoint": "", "UserApiEndpoint": "" } -} +}
\ No newline at end of file diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 2c109c105..3a5195de3 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -54,7 +54,11 @@ "AmazonS3AccessKeyId": "", "AmazonS3SecretAccessKey": "", "AmazonS3Bucket": "", - "AmazonS3Region": "" + "AmazonS3Region": "", + "AmazonS3Endpoint": "", + "AmazonS3BucketEndpoint": "", + "AmazonS3LocationConstraint": false, + "AmazonS3LowercaseBucket": false }, "EmailSettings": { "EnableSignUpWithEmail": true, diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index 2c109c105..3a5195de3 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -54,7 +54,11 @@ "AmazonS3AccessKeyId": "", "AmazonS3SecretAccessKey": "", "AmazonS3Bucket": "", - "AmazonS3Region": "" + "AmazonS3Region": "", + "AmazonS3Endpoint": "", + "AmazonS3BucketEndpoint": "", + "AmazonS3LocationConstraint": false, + "AmazonS3LowercaseBucket": false }, "EmailSettings": { "EnableSignUpWithEmail": true, diff --git a/utils/mail.go b/utils/mail.go index 07a79eeb2..6625060de 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -98,11 +98,12 @@ func SendMail(to, subject, body string) *model.AppError { } func SendMailUsingConfig(to, subject, body string, config *model.Config) *model.AppError { - if !config.EmailSettings.SendEmailNotifications || len(config.EmailSettings.SMTPServer) == 0 { return nil } + l4g.Debug("sending mail to " + to + " with subject of '" + subject + "'") + fromMail := mail.Address{config.EmailSettings.FeedbackName, config.EmailSettings.FeedbackEmail} toMail := mail.Address{"", to} |