aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-02-15 18:30:54 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-02-15 18:30:54 +0100
commit846f0c055dfdd800b77cab02a34266d7fe4c4324 (patch)
treeaa722609a285c9b55dd0c1382011f2a486b2a30a
parent432be14afd6ff360adc7ba349b3b1ae362388b7b (diff)
Try yaml
-rw-r--r--cmd/acme/config.go18
-rw-r--r--cmd/acme/main.go2
2 files changed, 12 insertions, 8 deletions
diff --git a/cmd/acme/config.go b/cmd/acme/config.go
index 6ad4ca5..ad2df73 100644
--- a/cmd/acme/config.go
+++ b/cmd/acme/config.go
@@ -2,13 +2,13 @@ package main
import (
"errors"
+ "io/ioutil"
"path"
"strings"
"time"
"dim13.org/acme"
-
- "github.com/BurntSushi/toml"
+ "gopkg.in/yaml.v2"
)
const defKeySize = 2048
@@ -22,7 +22,7 @@ type Config struct {
}
type defaults struct {
- Gracetime duration
+ Gracetime
Listen string
ListenTLS string
Provider string
@@ -75,7 +75,11 @@ var (
func LoadConfig(fname string) (*Config, error) {
c := &Config{}
- _, err := toml.DecodeFile(fname, c)
+ conf, err := ioutil.ReadFile(fname)
+ if err != nil {
+ return nil, err
+ }
+ err = yaml.Unmarshal(conf, c)
if err != nil {
return nil, err
}
@@ -142,10 +146,10 @@ func LoadConfig(fname string) (*Config, error) {
return c, nil
}
-type duration struct{ time.Duration }
+type Gracetime struct{ time.Duration }
-func (d *duration) UnmarshalText(s []byte) error {
+func (g *Gracetime) UnmarshalText(s []byte) error {
var err error
- d.Duration, err = time.ParseDuration(string(s))
+ g.Duration, err = time.ParseDuration(string(s))
return err
}
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 9a0f87d..070bba3 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -11,7 +11,7 @@ import (
)
var (
- confName = flag.String("conf", "acme.toml", "configuration file")
+ confName = flag.String("conf", "", "configuration file")
tracing = flag.String("trace", "", "trace output file")
)