diff options
| author | Chris Lu <chris.lu@gmail.com> | 2015-01-05 14:20:04 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2015-01-05 14:20:04 -0800 |
| commit | a3e4145e8ab8958e750459dd001a24d5b5f514a3 (patch) | |
| tree | b43dddc52826fd5da0c165e67897627df55f8d0f /go/weed/server.go | |
| parent | 878d1aa35e4ad1714fcb8818497f533cf2de2975 (diff) | |
| download | seaweedfs-a3e4145e8ab8958e750459dd001a24d5b5f514a3.tar.xz seaweedfs-a3e4145e8ab8958e750459dd001a24d5b5f514a3.zip | |
refactoring for later security changes
Diffstat (limited to 'go/weed/server.go')
| -rw-r--r-- | go/weed/server.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/go/weed/server.go b/go/weed/server.go index 67bbdb370..2db251944 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -56,6 +56,7 @@ var ( serverRack = cmdServer.Flag.String("rack", "", "current volume server's rack name") serverWhiteListOption = cmdServer.Flag.String("whiteList", "", "comma separated Ip addresses having write permission. No limit if empty.") serverPeers = cmdServer.Flag.String("master.peers", "", "other master nodes in comma separated ip:masterPort list") + serverSecureKey = cmdServer.Flag.String("secure.key", "", "secret key to ensure authenticated access") serverGarbageThreshold = cmdServer.Flag.String("garbageThreshold", "0.3", "threshold to vacuum and reclaim spaces") masterPort = cmdServer.Flag.Int("master.port", 9333, "master server http listen port") masterMetaFolder = cmdServer.Flag.String("master.dir", "", "data directory to store meta data, default to same as -dir specified") @@ -185,7 +186,8 @@ func runServer(cmd *Command, args []string) bool { go func() { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, *masterPort, *masterMetaFolder, - *masterVolumeSizeLimitMB, *volumePulse, *masterConfFile, *masterDefaultReplicaPlacement, *serverGarbageThreshold, serverWhiteList, + *masterVolumeSizeLimitMB, *volumePulse, *masterConfFile, *masterDefaultReplicaPlacement, *serverGarbageThreshold, + serverWhiteList, *serverSecureKey, ) glog.V(0).Infoln("Start Seaweed Master", util.VERSION, "at", *serverIp+":"+strconv.Itoa(*masterPort)) @@ -217,8 +219,8 @@ func runServer(cmd *Command, args []string) bool { time.Sleep(100 * time.Millisecond) r := http.NewServeMux() volumeServer := weed_server.NewVolumeServer(r, *serverIp, *volumePort, *serverPublicIp, folders, maxCounts, - *serverIp+":"+strconv.Itoa(*masterPort), *volumePulse, *serverDataCenter, *serverRack, serverWhiteList, - *volumeFixJpgOrientation, + *serverIp+":"+strconv.Itoa(*masterPort), *volumePulse, *serverDataCenter, *serverRack, + serverWhiteList, *volumeFixJpgOrientation, ) glog.V(0).Infoln("Start Seaweed volume server", util.VERSION, "at", *serverIp+":"+strconv.Itoa(*volumePort)) |