aboutsummaryrefslogtreecommitdiffhomepage
path: root/admin.go
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2019-04-25 13:54:48 -0600
committerMatthew Holt <[email protected]>2019-04-25 13:54:48 -0600
commit2d056fbe66849f041a233a0d961639fae3835cbb (patch)
treedc78505933861e01f615470ffc1dd56a852da0b8 /admin.go
parent545f28008e0175491af030f8689cab2112fda9ed (diff)
downloadcaddy-2d056fbe66849f041a233a0d961639fae3835cbb.tar.gz
caddy-2d056fbe66849f041a233a0d961639fae3835cbb.zip
Initial commit of Storage, TLS, and automatic HTTPS implementations
Diffstat (limited to 'admin.go')
-rw-r--r--admin.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/admin.go b/admin.go
index 487569b17..a123a64f1 100644
--- a/admin.go
+++ b/admin.go
@@ -119,15 +119,15 @@ func Load(r io.Reader) error {
return err
}
- var cfg Config
+ var cfg *Config
err = json.Unmarshal(buf.Bytes(), &cfg)
if err != nil {
return fmt.Errorf("decoding config: %v", err)
}
- err = Start(cfg)
+ err = Run(cfg)
if err != nil {
- return fmt.Errorf("starting: %v", err)
+ return fmt.Errorf("running: %v", err)
}
return nil