Skip to content

N
nexpie-grafana-theme
Commit 330cb92b by Torkel Ödegaard
Options

Merge branch 'v4.3.x'

parents 36953379 befc15c5
Showing with 5 additions and 1 deletions
pkg/components/imguploader/s3uploader.go
...@@ -78,5 +78,9 @@ func (u *S3Uploader) Upload(imageDiskPath string) (string, error) { ...@@ -78,5 +78,9 @@ func (u *S3Uploader) Upload(imageDiskPath string) (string, error) {
return "", err return "", err
} }
return "https://" + u.bucket + ".s3-" + u.region + ".amazonaws.com/" + key, nil if u.region == "us-east-1" {
return "https://" + u.bucket + ".s3.amazonaws.com/" + key, nil
} else {
return "https://" + u.bucket + ".s3-" + u.region + ".amazonaws.com/" + key, nil
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment