summaryrefslogtreecommitdiff
path: root/caddyconfig/caddyfile/adapter.go
diff options
context:
space:
mode:
authorMark Sargent <99003+sarge@users.noreply.github.com>2020-01-10 05:40:16 +1300
committerMatt Holt <mholt@users.noreply.github.com>2020-01-09 09:40:16 -0700
commit7c419d5349837b50c9d87be88fc438f8c4e475b9 (patch)
treed55af0dd7a330e4810f5da281ed4576c58f969fd /caddyconfig/caddyfile/adapter.go
parent3828a3aaacb6dbab7117efe3797eeb8625f9670f (diff)
caddyfile: Preprocess env vars in {$THIS} format (#2963)
* transform a caddyfile with environment variables * support adapt time and runtime variables in the caddyfile * caddyfile: Pre-process environment variables before parsing Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
Diffstat (limited to 'caddyconfig/caddyfile/adapter.go')
-rw-r--r--caddyconfig/caddyfile/adapter.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/caddyconfig/caddyfile/adapter.go b/caddyconfig/caddyfile/adapter.go
index 7a96e88..02a951b 100644
--- a/caddyconfig/caddyfile/adapter.go
+++ b/caddyconfig/caddyfile/adapter.go
@@ -15,7 +15,6 @@
package caddyfile
import (
- "bytes"
"encoding/json"
"fmt"
@@ -42,7 +41,7 @@ func (a Adapter) Adapt(body []byte, options map[string]interface{}) ([]byte, []c
filename = "Caddyfile"
}
- serverBlocks, err := Parse(filename, bytes.NewReader(body))
+ serverBlocks, err := Parse(filename, body)
if err != nil {
return nil, nil, err
}