diff options
| author | hilimd <68371223+hilimd@users.noreply.github.com> | 2020-10-22 15:50:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-22 15:50:49 +0800 |
| commit | cf7a1c722fa82fa78c546f68e4814fff7dc6d1e2 (patch) | |
| tree | 1470a0d158a31b516e02202c004dfb413a29e186 /weed/command | |
| parent | ab1105c52472946efab9713bf15df45e14ff4514 (diff) | |
| parent | 5179e559f74cf7aed562f785e40bef46da3191bf (diff) | |
| download | seaweedfs-cf7a1c722fa82fa78c546f68e4814fff7dc6d1e2.tar.xz seaweedfs-cf7a1c722fa82fa78c546f68e4814fff7dc6d1e2.zip | |
Merge pull request #32 from chrislusf/master
sync
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/filer.go | 2 | ||||
| -rw-r--r-- | weed/command/s3.go | 2 | ||||
| -rw-r--r-- | weed/command/server.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/weed/command/filer.go b/weed/command/filer.go index 793401fe3..1ea334e61 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -69,7 +69,7 @@ func init() { // start s3 on filer filerStartS3 = cmdFiler.Flag.Bool("s3", false, "whether to start S3 gateway") filerS3Options.port = cmdFiler.Flag.Int("s3.port", 8333, "s3 server http listen port") - filerS3Options.domainName = cmdFiler.Flag.String("s3.domainName", "", "suffix of the host name, {bucket}.{domainName}") + filerS3Options.domainName = cmdFiler.Flag.String("s3.domainName", "", "suffix of the host name in comma separated list, {bucket}.{domainName}") filerS3Options.tlsPrivateKey = cmdFiler.Flag.String("s3.key.file", "", "path to the TLS private key file") filerS3Options.tlsCertificate = cmdFiler.Flag.String("s3.cert.file", "", "path to the TLS certificate file") filerS3Options.config = cmdFiler.Flag.String("s3.config", "", "path to the config file") diff --git a/weed/command/s3.go b/weed/command/s3.go index 7d0954c0c..ed5bb0b80 100644 --- a/weed/command/s3.go +++ b/weed/command/s3.go @@ -36,7 +36,7 @@ func init() { cmdS3.Run = runS3 // break init cycle s3StandaloneOptions.filer = cmdS3.Flag.String("filer", "localhost:8888", "filer server address") s3StandaloneOptions.port = cmdS3.Flag.Int("port", 8333, "s3 server http listen port") - s3StandaloneOptions.domainName = cmdS3.Flag.String("domainName", "", "suffix of the host name, {bucket}.{domainName}") + s3StandaloneOptions.domainName = cmdS3.Flag.String("domainName", "", "suffix of the host name in comma separated list, {bucket}.{domainName}") s3StandaloneOptions.config = cmdS3.Flag.String("config", "", "path to the config file") s3StandaloneOptions.tlsPrivateKey = cmdS3.Flag.String("key.file", "", "path to the TLS private key file") s3StandaloneOptions.tlsCertificate = cmdS3.Flag.String("cert.file", "", "path to the TLS certificate file") diff --git a/weed/command/server.go b/weed/command/server.go index c55d2cfee..6a78fb3f4 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -105,7 +105,7 @@ func init() { serverOptions.v.pprof = cmdServer.Flag.Bool("volume.pprof", false, "enable pprof http handlers. precludes --memprofile and --cpuprofile") s3Options.port = cmdServer.Flag.Int("s3.port", 8333, "s3 server http listen port") - s3Options.domainName = cmdServer.Flag.String("s3.domainName", "", "suffix of the host name, {bucket}.{domainName}") + s3Options.domainName = cmdServer.Flag.String("s3.domainName", "", "suffix of the host name in comma separated list, {bucket}.{domainName}") 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.config = cmdServer.Flag.String("s3.config", "", "path to the config file") |