diff options
| -rw-r--r-- | weed/command/filer.go | 3 | ||||
| -rw-r--r-- | weed/command/scaffold.go | 3 | ||||
| -rw-r--r-- | weed/command/server.go | 1 | ||||
| -rw-r--r-- | weed/server/filer_server.go | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/weed/command/filer.go b/weed/command/filer.go index 0156fe1b9..ea8392fac 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -33,7 +33,6 @@ type FilerOptions struct { dataCenter *string enableNotification *bool disableHttp *bool - dirBucketsPath *string // default leveldb directory, used in "weed server" mode defaultLevelDbDirectory *string @@ -53,7 +52,6 @@ func init() { f.dirListingLimit = cmdFiler.Flag.Int("dirListLimit", 100000, "limit sub dir listing size") f.dataCenter = cmdFiler.Flag.String("dataCenter", "", "prefer to write to volumes in this data center") f.disableHttp = cmdFiler.Flag.Bool("disableHttp", false, "disable http request, only gRpc operations are allowed") - f.dirBucketsPath = cmdFiler.Flag.String("dir.buckets", "/buckets", "folder to store all buckets") } var cmdFiler = &Command{ @@ -111,7 +109,6 @@ func (fo *FilerOptions) startFiler() { DataCenter: *fo.dataCenter, DefaultLevelDbDir: defaultLevelDbDirectory, DisableHttp: *fo.disableHttp, - DirBucketsPath: *fo.dirBucketsPath, Port: *fo.port, }) if nfs_err != nil { diff --git a/weed/command/scaffold.go b/weed/command/scaffold.go index ab658735f..09f1cac6c 100644 --- a/weed/command/scaffold.go +++ b/weed/command/scaffold.go @@ -74,7 +74,8 @@ const ( # with http DELETE, by default the filer would check whether a folder is empty. # recursive_delete will delete all sub folders and files, similar to "rm -Rf" recursive_delete = false - +# directories under this folder will be automatically creating a separate bucket +buckets_folder = /buckets #################################################### # The following are filer store options diff --git a/weed/command/server.go b/weed/command/server.go index aa693618c..c9d27555c 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -82,7 +82,6 @@ func init() { filerOptions.disableDirListing = cmdServer.Flag.Bool("filer.disableDirListing", false, "turn off directory listing") filerOptions.maxMB = cmdServer.Flag.Int("filer.maxMB", 32, "split files larger than the limit") filerOptions.dirListingLimit = cmdServer.Flag.Int("filer.dirListLimit", 1000, "limit sub dir listing size") - filerOptions.dirBucketsPath = cmdServer.Flag.String("filer.dir.buckets", "/buckets", "folder to store all buckets") serverOptions.v.port = cmdServer.Flag.Int("volume.port", 8080, "volume server http listen port") serverOptions.v.publicPort = cmdServer.Flag.Int("volume.port.public", 0, "volume server public port") diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 51444a5b0..55888a4a4 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -83,6 +83,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) util.LoadConfiguration("notification", false) fs.option.recursiveDelete = v.GetBool("filer.options.recursive_delete") + fs.option.DirBucketsPath = v.GetString("filer.option.buckets_folder") fs.filer.LoadConfiguration(v) notification.LoadConfiguration(v, "notification.") |