BUG/MINOR: external mode: copy haproxy.cfg form usr/local/etc/haproxy

Mo3m3n · oktalz · commit 00ca7a39f948 · 2021-05-27T09:32:22.000+02:00
In 4262a20 base dir was updated to usr/local/etc/haproxy, external.go needs also to be updated.
diff --git a/external.go b/external.go
@@ -60,7 +60,7 @@ func setupHAProxyEnv(osArgs utils.OSArgs) config.ControllerCfg {
 		logger.Panic(err)
 	}
 	logger.Debug(dir)
-	origin := path.Join(dir, "fs/etc/haproxy/haproxy.cfg")
+	origin := path.Join(dir, "fs/usr/local/etc/haproxy/haproxy.cfg")
 	_, err = os.Stat(origin)
 	if err != nil {
 		if _, err = os.Stat(cfg.Env.MainCFGFile); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func setupHAProxyEnv(osArgs utils.OSArgs) config.ControllerCfg {`
`60`	`60`	`logger.Panic(err)`
`61`	`61`	`}`
`62`	`62`	`logger.Debug(dir)`
`63`		`- origin := path.Join(dir, "fs/etc/haproxy/haproxy.cfg")`
	`63`	`+ origin := path.Join(dir, "fs/usr/local/etc/haproxy/haproxy.cfg")`
`64`	`64`	`_, err = os.Stat(origin)`
`65`	`65`	`if err != nil {`
`66`	`66`	`if _, err = os.Stat(cfg.Env.MainCFGFile); err != nil {`