diff options
| author | Chris Lu <chris.lu@gmail.com> | 2017-02-12 21:58:44 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2017-02-12 21:58:44 -0800 |
| commit | 41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506 (patch) | |
| tree | 92ea9772e8e0169a1a97af78a04de9f39eb29c13 /weed/command/server.go | |
| parent | 98d66a569b0b1ee1ef0b58fbf3bd0fa2fc917f5d (diff) | |
| download | seaweedfs-41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506.tar.xz seaweedfs-41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506.zip | |
remove weeds.conf
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index b4b98ba1e..e1152f23f 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -66,7 +66,6 @@ var ( masterMetaFolder = cmdServer.Flag.String("master.dir", "", "data directory to store meta data, default to same as -dir specified") masterVolumeSizeLimitMB = cmdServer.Flag.Uint("master.volumeSizeLimitMB", 30*1000, "Master stops directing writes to oversized volumes.") masterVolumePreallocate = cmdServer.Flag.Bool("master.volumePreallocate", false, "Preallocate disk space for volumes.") - masterConfFile = cmdServer.Flag.String("master.conf", "/etc/weedfs/weedfs.conf", "xml configuration file") masterDefaultReplicaPlacement = cmdServer.Flag.String("master.defaultReplicaPlacement", "000", "Default replication type if not specified.") volumePort = cmdServer.Flag.Int("volume.port", 8080, "volume server http listen port") volumePublicPort = cmdServer.Flag.Int("volume.port.public", 0, "volume server public port") @@ -210,7 +209,7 @@ func runServer(cmd *Command, args []string) bool { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, *masterPort, *masterMetaFolder, *masterVolumeSizeLimitMB, *masterVolumePreallocate, - *volumePulse, *masterConfFile, *masterDefaultReplicaPlacement, *serverGarbageThreshold, + *volumePulse, *masterDefaultReplicaPlacement, *serverGarbageThreshold, serverWhiteList, *serverSecureKey, ) |