Commit 8098fb4e authored by Eric's avatar Eric

[update] fix s3 upload bugs

parent 03594f23
......@@ -301,6 +301,7 @@
"github.com/aws/aws-sdk-go/aws",
"github.com/aws/aws-sdk-go/aws/credentials",
"github.com/aws/aws-sdk-go/aws/session",
"github.com/aws/aws-sdk-go/service/s3",
"github.com/aws/aws-sdk-go/service/s3/s3manager",
"github.com/elastic/go-elasticsearch",
"github.com/gliderlabs/ssh",
......
......@@ -61,16 +61,25 @@ func NewReplayStorage() ReplayStorage {
secretKey: cf["SECRET_KEY"].(string),
}
case "s3":
var region string
var endpoint string
bucket := cf["BUCKET"].(string)
endpoint = cf["ENDPOINT"].(string)
if bucket == "" {
bucket = "jumpserver"
}
if cf["REGION"] != nil {
region = cf["REGION"].(string)
} else {
region = strings.Split(endpoint, ".")[1]
}
return &S3ReplayStorage{
bucket: bucket,
region: cf["REGION"].(string),
region: region,
accessKey: cf["ACCESS_KEY"].(string),
secretKey: cf["SECRET_KEY"].(string),
endpoint: cf["ENDPOINT"].(string),
endpoint: endpoint,
}
default:
return defaultReplayStorage
......
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