diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-12-07 16:46:48 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-12-07 16:46:48 -0800 |
| commit | 06bb7bf6c00982deb9eae953c85a730a1745c368 (patch) | |
| tree | 27ded05eeb16dac7d0166a9343d46d990dd08cb1 | |
| parent | fce880308773a1bbc88ab214a96c3f22d68981ca (diff) | |
| download | seaweedfs-06bb7bf6c00982deb9eae953c85a730a1745c368.tar.xz seaweedfs-06bb7bf6c00982deb9eae953c85a730a1745c368.zip | |
adding /usr/local/etc/seaweedfs for bsd style config search path
related to https://reviews.freebsd.org/D27391
| -rw-r--r-- | weed/command/filer.go | 2 | ||||
| -rw-r--r-- | weed/command/master.go | 2 | ||||
| -rw-r--r-- | weed/util/config.go | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/weed/command/filer.go b/weed/command/filer.go index 10dfdffad..e72056893 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -91,7 +91,7 @@ var cmdFiler = &Command{ //return a json format subdirectory and files listing GET /path/to/ - The configuration file "filer.toml" is read from ".", "$HOME/.seaweedfs/", or "/etc/seaweedfs/", in that order. + The configuration file "filer.toml" is read from ".", "$HOME/.seaweedfs/", "/usr/local/etc/seaweedfs/", or "/etc/seaweedfs/", in that order. The example filer.toml configuration file can be generated by "weed scaffold -config=filer" diff --git a/weed/command/master.go b/weed/command/master.go index c03da7f5d..d569919cd 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -69,7 +69,7 @@ var cmdMaster = &Command{ Short: "start a master server", Long: `start a master server to provide volume=>location mapping service and sequence number of file ids - The configuration file "security.toml" is read from ".", "$HOME/.seaweedfs/", or "/etc/seaweedfs/", in that order. + The configuration file "security.toml" is read from ".", "$HOME/.seaweedfs/", "/usr/local/etc/seaweedfs/", or "/etc/seaweedfs/", in that order. The example security.toml configuration file can be generated by "weed scaffold -config=security" diff --git a/weed/util/config.go b/weed/util/config.go index 6acf21c12..47f433028 100644 --- a/weed/util/config.go +++ b/weed/util/config.go @@ -22,6 +22,7 @@ func LoadConfiguration(configFileName string, required bool) (loaded bool) { viper.SetConfigName(configFileName) // name of config file (without extension) viper.AddConfigPath(".") // optionally look for config in the working directory viper.AddConfigPath("$HOME/.seaweedfs") // call multiple times to add many search paths + viper.AddConfigPath("/usr/local/etc/seaweedfs/") // search path for bsd-style config directory in viper.AddConfigPath("/etc/seaweedfs/") // path to look for the config file in glog.V(1).Infof("Reading %s.toml from %s", configFileName, viper.ConfigFileUsed()) |