From f635033e3e953e74d67b76a520c9760786330af5 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Tue, 24 Jan 2017 23:43:28 +0000 Subject: Switch to scl, an extension of hcl --- cmd/cashierd/main.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'cmd') diff --git a/cmd/cashierd/main.go b/cmd/cashierd/main.go index fc03171..95cf194 100644 --- a/cmd/cashierd/main.go +++ b/cmd/cashierd/main.go @@ -292,15 +292,6 @@ func newState() string { return hex.EncodeToString(k) } -func readConfig(filename string) (*config.Config, error) { - f, err := os.Open(filename) - if err != nil { - return nil, errors.Wrap(err, "failed to parse config file") - } - defer f.Close() - return config.ReadConfig(f) -} - func loadCerts(certFile, keyFile string) (tls.Certificate, error) { key, err := wkfs.ReadFile(keyFile) if err != nil { @@ -316,7 +307,7 @@ func loadCerts(certFile, keyFile string) (tls.Certificate, error) { func main() { // Privileged section flag.Parse() - conf, err := readConfig(*cfg) + conf, err := config.ReadConfig(*cfg) if err != nil { log.Fatal(err) } -- cgit v1.2.3