Stowage/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-12-08 06:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

caddyfile: fix replacing variables on imported files (#2970)

Browse source 
* fix replacing variables on imported files

* refactored replaceEnvVars to ensure it is always called

* Use byte slices for easier use

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
This commit is contained in:
Mark Sargent 2020-01-10 15:34:22 +13:00 • committed by Matt Holt
parent 29315847a8
commit 871abf1053
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
caddyconfig/caddyfile/dispenser_test.go
View file

@ -308,7 +308,7 @@ func TestDispenser_ArgErr_Err(t *testing.T) {
}
func newTestDispenser(input string) *Dispenser {
tokens, err := allTokens("Testfile", strings.NewReader(input))
tokens, err := allTokens("Testfile", []byte(input))
if err != nil && err != io.EOF {
log.Fatalf("getting all tokens from input: %v", err)
}