diff options
| author | chrislu <chris.lu@gmail.com> | 2023-12-22 11:33:02 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-12-22 11:33:02 -0800 |
| commit | ee1c9bc314970931ebbc018e70bd7ad39bd84602 (patch) | |
| tree | 3aa6ad7b157cd4ac93d5a76f9d1aa2fd3ee81e73 /weed/command/server.go | |
| parent | 034db049a080d9a07a8527894e0aa58e8412207e (diff) | |
| parent | c278f49bca0b8253914c5490a17ac4b50b8abe2b (diff) | |
| download | seaweedfs-ee1c9bc314970931ebbc018e70bd7ad39bd84602.tar.xz seaweedfs-ee1c9bc314970931ebbc018e70bd7ad39bd84602.zip | |
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index 67e37426e..9631f6bfd 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -106,6 +106,7 @@ func init() { filerOptions.port = cmdServer.Flag.Int("filer.port", 8888, "filer server http listen port") filerOptions.portGrpc = cmdServer.Flag.Int("filer.port.grpc", 0, "filer server grpc listen port") filerOptions.publicPort = cmdServer.Flag.Int("filer.port.public", 0, "filer server public http listen port") + filerOptions.allowedOrigins = cmdServer.Flag.String("filer.allowedOrigins", "*", "comma separated list of allowed origins") filerOptions.defaultReplicaPlacement = cmdServer.Flag.String("filer.defaultReplicaPlacement", "", "default replication type. If not specified, use master setting.") filerOptions.disableDirListing = cmdServer.Flag.Bool("filer.disableDirListing", false, "turn off directory listing") filerOptions.maxMB = cmdServer.Flag.Int("filer.maxMB", 4, "split files larger than the limit") @@ -142,6 +143,7 @@ func init() { s3Options.portHttps = cmdServer.Flag.Int("s3.port.https", 0, "s3 server https listen port") s3Options.portGrpc = cmdServer.Flag.Int("s3.port.grpc", 0, "s3 server grpc listen port") s3Options.domainName = cmdServer.Flag.String("s3.domainName", "", "suffix of the host name in comma separated list, {bucket}.{domainName}") + s3Options.allowedOrigins = cmdServer.Flag.String("s3.allowedOrigins", "*", "comma separated list of allowed origins") s3Options.tlsPrivateKey = cmdServer.Flag.String("s3.key.file", "", "path to the TLS private key file") s3Options.tlsCertificate = cmdServer.Flag.String("s3.cert.file", "", "path to the TLS certificate file") s3Options.tlsCACertificate = cmdServer.Flag.String("s3.cacert.file", "", "path to the TLS CA certificate file") |