cmd: Fix paths when using an env file (#4296)

pascal-zarrad · web-flow · commit ce5a45db4581 · 2021-08-20T15:51:31.000-06:00
* core: Fix paths when using an env file

* refactor: move path logic to loadFromEnv
diff --git a/cmd/main.go b/cmd/main.go
@@ -361,6 +361,11 @@ func loadEnvFromFile(envFile string) error {
 		}
 	}
 
+	// Update the storage paths to ensure they have the proper
+	// value after loading a specified env file.
+	caddy.ConfigAutosavePath = filepath.Join(caddy.AppConfigDir(), "autosave.json")
+	caddy.DefaultStorage = &certmagic.FileStorage{Path: caddy.AppDataDir()}
+
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -361,6 +361,11 @@ func loadEnvFromFile(envFile string) error {`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
	`364`	`+ // Update the storage paths to ensure they have the proper`
	`365`	`+ // value after loading a specified env file.`
	`366`	`+ caddy.ConfigAutosavePath = filepath.Join(caddy.AppConfigDir(), "autosave.json")`
	`367`	`+ caddy.DefaultStorage = &certmagic.FileStorage{Path: caddy.AppDataDir()}`
	`368`	`+`
`364`	`369`	`return nil`
`365`	`370`	`}`
`366`	`371`