aboutsummaryrefslogtreecommitdiff
path: root/weed/s3api/s3api_server.go
diff options
context:
space:
mode:
authorhilimd <68371223+hilimd@users.noreply.github.com>2020-10-22 15:50:49 +0800
committerGitHub <noreply@github.com>2020-10-22 15:50:49 +0800
commitcf7a1c722fa82fa78c546f68e4814fff7dc6d1e2 (patch)
tree1470a0d158a31b516e02202c004dfb413a29e186 /weed/s3api/s3api_server.go
parentab1105c52472946efab9713bf15df45e14ff4514 (diff)
parent5179e559f74cf7aed562f785e40bef46da3191bf (diff)
downloadseaweedfs-cf7a1c722fa82fa78c546f68e4814fff7dc6d1e2.tar.xz
seaweedfs-cf7a1c722fa82fa78c546f68e4814fff7dc6d1e2.zip
Merge pull request #32 from chrislusf/master
sync
Diffstat (limited to 'weed/s3api/s3api_server.go')
-rw-r--r--weed/s3api/s3api_server.go12
1 files changed, 8 insertions, 4 deletions
diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go
index 1ab80c3ee..b1e1cfe80 100644
--- a/weed/s3api/s3api_server.go
+++ b/weed/s3api/s3api_server.go
@@ -3,6 +3,7 @@ package s3api
import (
"fmt"
"net/http"
+ "strings"
"github.com/gorilla/mux"
"google.golang.org/grpc"
@@ -39,10 +40,13 @@ func (s3a *S3ApiServer) registerRouter(router *mux.Router) {
apiRouter := router.PathPrefix("/").Subrouter()
var routers []*mux.Router
if s3a.option.DomainName != "" {
- routers = append(routers, apiRouter.Host(
- fmt.Sprintf("%s.%s:%d", "{bucket:.+}", s3a.option.DomainName, s3a.option.Port)).Subrouter())
- routers = append(routers, apiRouter.Host(
- fmt.Sprintf("%s.%s", "{bucket:.+}", s3a.option.DomainName)).Subrouter())
+ domainNames := strings.Split(s3a.option.DomainName, ",")
+ for _, domainName := range domainNames {
+ routers = append(routers, apiRouter.Host(
+ fmt.Sprintf("%s.%s:%d", "{bucket:.+}", domainName, s3a.option.Port)).Subrouter())
+ routers = append(routers, apiRouter.Host(
+ fmt.Sprintf("%s.%s", "{bucket:.+}", domainName)).Subrouter())
+ }
}
routers = append(routers, apiRouter.PathPrefix("/{bucket}").Subrouter())