Просмотр исходного кода

adding /usr/local/etc/seaweedfs for bsd style config search path

related to https://reviews.freebsd.org/D27391
Chris Lu 4 лет назад
Родитель
Сommit
06bb7bf6c0
3 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      weed/command/filer.go
  2. 1 1
      weed/command/master.go
  3. 1 0
      weed/util/config.go

+ 1 - 1
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"
 

+ 1 - 1
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"
 

+ 1 - 0
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())