From c636683a650a2e2604bbbb6510d044f95285ba69 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 15 Dec 2015 13:15:33 +0100 Subject: Move config into daemon section --- cmd/acmed/config.go | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ config.go | 49 ------------------------------------------------- 2 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 cmd/acmed/config.go delete mode 100644 config.go diff --git a/cmd/acmed/config.go b/cmd/acmed/config.go new file mode 100644 index 0000000..2e19849 --- /dev/null +++ b/cmd/acmed/config.go @@ -0,0 +1,49 @@ +package main + +import "github.com/BurntSushi/toml" + +type Config struct { + Defaults defaults + Provider map[string]provider + Account map[string]account + Hook map[string]hook + Desire map[string]desire +} + +type defaults struct { + Gracetime string + Listen string + Provider string + Account string + Basedir string +} + +type provider struct { + Directory string +} + +type account struct { + Mail string + Phone string + Key string +} + +type hook struct { + CMD string +} + +type desire struct { + Provider string + Account string + Altnames []string + Key string + Cert string + Webroot string + Hooks []string +} + +func LoadConfig(fname string) (*Config, error) { + c := &Config{} + _, err := toml.DecodeFile(fname, c) + return c, err +} diff --git a/config.go b/config.go deleted file mode 100644 index cc97088..0000000 --- a/config.go +++ /dev/null @@ -1,49 +0,0 @@ -package acme - -import "github.com/BurntSushi/toml" - -type Config struct { - Defaults defaults - Provider map[string]provider - Account map[string]account - Hook map[string]hook - Desire map[string]desire -} - -type defaults struct { - Gracetime string - Listen string - Provider string - Account string - Basedir string -} - -type provider struct { - Directory string -} - -type account struct { - Mail string - Phone string - Key string -} - -type hook struct { - CMD string -} - -type desire struct { - Provider string - Account string - Altnames []string - Key string - Cert string - Webroot string - Hooks []string -} - -func LoadConfig(fname string) (*Config, error) { - c := &Config{} - _, err := toml.DecodeFile(fname, c) - return c, err -} -- cgit v1.2.3