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/master.go | |
| parent | 878d1aa35e4ad1714fcb8818497f533cf2de2975 (diff) | |
| download | seaweedfs-a3e4145e8ab8958e750459dd001a24d5b5f514a3.tar.xz seaweedfs-a3e4145e8ab8958e750459dd001a24d5b5f514a3.zip | |
refactoring for later security changes
Diffstat (limited to 'go/weed/master.go')
| -rw-r--r-- | go/weed/master.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/go/weed/master.go b/go/weed/master.go index f88964b6d..de4b5cb4b 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -42,6 +42,7 @@ var ( mMaxCpu = cmdMaster.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs") garbageThreshold = cmdMaster.Flag.String("garbageThreshold", "0.3", "threshold to vacuum and reclaim spaces") masterWhiteListOption = cmdMaster.Flag.String("whiteList", "", "comma separated Ip addresses having write permission. No limit if empty.") + masterSecureKey = cmdMaster.Flag.String("secure.key", "", "secret key to check permission") masterWhiteList []string ) @@ -60,7 +61,8 @@ func runMaster(cmd *Command, args []string) bool { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, *mport, *metaFolder, - *volumeSizeLimitMB, *mpulse, *confFile, *defaultReplicaPlacement, *garbageThreshold, masterWhiteList, + *volumeSizeLimitMB, *mpulse, *confFile, *defaultReplicaPlacement, *garbageThreshold, + masterWhiteList, *masterSecureKey, ) listeningAddress := *masterBindIp + ":" + strconv.Itoa(*mport) |