|
@ -156,6 +156,7 @@ func init() { |
|
|
s3Options.allowEmptyFolder = cmdServer.Flag.Bool("s3.allowEmptyFolder", true, "allow empty folders") |
|
|
s3Options.allowEmptyFolder = cmdServer.Flag.Bool("s3.allowEmptyFolder", true, "allow empty folders") |
|
|
s3Options.allowDeleteBucketNotEmpty = cmdServer.Flag.Bool("s3.allowDeleteBucketNotEmpty", true, "allow recursive deleting all entries along with bucket") |
|
|
s3Options.allowDeleteBucketNotEmpty = cmdServer.Flag.Bool("s3.allowDeleteBucketNotEmpty", true, "allow recursive deleting all entries along with bucket") |
|
|
s3Options.localSocket = cmdServer.Flag.String("s3.localSocket", "", "default to /tmp/seaweedfs-s3-<port>.sock") |
|
|
s3Options.localSocket = cmdServer.Flag.String("s3.localSocket", "", "default to /tmp/seaweedfs-s3-<port>.sock") |
|
|
|
|
|
s3Options.bindIp = cmdServer.Flag.String("s3.ip.bind", "", "ip address to bind to. If empty, default to same as -ip.bind option.") |
|
|
|
|
|
|
|
|
iamOptions.port = cmdServer.Flag.Int("iam.port", 8111, "iam server http listen port") |
|
|
iamOptions.port = cmdServer.Flag.Int("iam.port", 8111, "iam server http listen port") |
|
|
|
|
|
|
|
@ -218,7 +219,9 @@ func runServer(cmd *Command, args []string) bool { |
|
|
filerOptions.masters = pb.ServerAddresses(*masterOptions.peers).ToServiceDiscovery() |
|
|
filerOptions.masters = pb.ServerAddresses(*masterOptions.peers).ToServiceDiscovery() |
|
|
filerOptions.ip = serverIp |
|
|
filerOptions.ip = serverIp |
|
|
filerOptions.bindIp = serverBindIp |
|
|
filerOptions.bindIp = serverBindIp |
|
|
s3Options.bindIp = serverBindIp |
|
|
|
|
|
|
|
|
if *s3Options.bindIp == "" { |
|
|
|
|
|
s3Options.bindIp = serverBindIp |
|
|
|
|
|
} |
|
|
iamOptions.ip = serverBindIp |
|
|
iamOptions.ip = serverBindIp |
|
|
iamOptions.masters = masterOptions.peers |
|
|
iamOptions.masters = masterOptions.peers |
|
|
webdavOptions.ipBind = serverBindIp |
|
|
webdavOptions.ipBind = serverBindIp |
|
|