Merge remote-tracking branch 'upstream/master'

tantra35 · tantra35 · commit 1a95e0b1f082 · 2025-03-08T21:23:08.000+03:00
diff --git a/cmd/daemon/main.go b/cmd/daemon/main.go
@@ -465,7 +465,11 @@ func loadConfig(cfg *Config) error {
 }
 
 func (cfg *Config) ConfigPath() string {
-	return filepath.Join(cfg.ConfigDir, "config.yml")
+	if _, err := os.Stat(filepath.Join(cfg.ConfigDir, "config.yaml")); os.IsNotExist(err) {
+		return filepath.Join(cfg.ConfigDir, "config.yml")
+	} else {
+		return filepath.Join(cfg.ConfigDir, "config.yaml")
+	}
 }
 
 func (cfg *Config) StatePath() string {

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,11 @@ func loadConfig(cfg *Config) error {`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`func (cfg *Config) ConfigPath() string {`
`468`		`- return filepath.Join(cfg.ConfigDir, "config.yml")`
	`468`	`+ if _, err := os.Stat(filepath.Join(cfg.ConfigDir, "config.yaml")); os.IsNotExist(err) {`
	`469`	`+ return filepath.Join(cfg.ConfigDir, "config.yml")`
	`470`	`+ } else {`
	`471`	`+ return filepath.Join(cfg.ConfigDir, "config.yaml")`
	`472`	`+ }`
`469`	`473`	`}`
`470`	`474`
`471`	`475`	`func (cfg *Config) StatePath() string {`