aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-20 21:51:31 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-20 21:51:31 +0100
commit0425fd366a1b1410048620b28af9dd5fb9a772b9 (patch)
tree51e02c6b0d88211c4bbdb8a1266d5c15ac4df957
parentbe4ffabba4162b944cedce6a98ed5fc6071f51aa (diff)
WIP, broken
-rw-r--r--cmd/batch/args.go8
-rw-r--r--cmd/batch/files.go2
-rw-r--r--cmd/batch/main.go17
3 files changed, 11 insertions, 16 deletions
diff --git a/cmd/batch/args.go b/cmd/batch/args.go
index 26a0654..ab7d03f 100644
--- a/cmd/batch/args.go
+++ b/cmd/batch/args.go
@@ -13,11 +13,6 @@ type Domains []string
func (v Domains) String() string { return fmt.Sprint([]string(v)) }
func (v *Domains) Set(s string) error { *v = append(*v, s); return nil }
-type Emails []string
-
-func (v Emails) String() string { return fmt.Sprint([]string(v)) }
-func (v *Emails) Set(s string) error { *v = append(*v, s); return nil }
-
var (
baseDir = flag.String("basedir", "/etc/ssl", "Base directory for SSL files")
graceTime = flag.Duration("gracetime", 24*7*time.Hour, "Renew grace time")
@@ -26,12 +21,11 @@ var (
force = flag.Bool("force", false, "Forece renewal")
listen = flag.String("listen", ":8080", "HTTP Solver")
listenTLS = flag.String("listentls", ":8443", "TLS Solver")
- emails = new(Emails)
+ email = flag.String("email", "", "eMail addresses")
domains = new(Domains)
)
func init() {
flag.Var(domains, "domain", "Domain list (multiple values)")
- flag.Var(emails, "email", "eMail addresses (multiple values)")
flag.Parse()
}
diff --git a/cmd/batch/files.go b/cmd/batch/files.go
index 371b856..20cb6e1 100644
--- a/cmd/batch/files.go
+++ b/cmd/batch/files.go
@@ -18,7 +18,7 @@ type Cert struct {
tls.Certificate
keyFile string
crtFile string
- accFile string
+ sigFile string
crypto.PrivateKey
}
diff --git a/cmd/batch/main.go b/cmd/batch/main.go
index 8790c9a..ef7ec2f 100644
--- a/cmd/batch/main.go
+++ b/cmd/batch/main.go
@@ -50,7 +50,7 @@ func main() {
}
_ = csr
}
- if len(*emails) > 0 && len(*domains) > 0 {
+ if *email != "" && len(*domains) > 0 {
key, err := acme.NewKey(*keySize)
if err != nil {
log.Fatal(err)
@@ -59,14 +59,14 @@ func main() {
if err != nil {
log.Fatal(err)
}
+
var con acme.Contacts
- for _, email := range *emails {
- m, err := acme.NewMail(email)
- if err != nil {
- log.Fatal(err)
- }
- con = append(con, m)
+ m, err := acme.NewMail(*email)
+ if err != nil {
+ log.Fatal(err)
}
+ con = append(con, m)
+
log.Println("Register", con)
err = prov.Register(sig, con, agree)
if err != nil {
@@ -82,13 +82,14 @@ func main() {
}
log.Println("Request bundle for", *domains)
- cert, err := prov.Bundle(sig, key, *domains, *emails)
+ cert, err := prov.Bundle(sig, key, *domains, []string{*email})
if err != nil {
log.Fatal(err)
}
c := Cert{
Certificate: cert,
+ sigFile: path.Join(*baseDir, "private", *email+".key"),
keyFile: path.Join(*baseDir, "private", (*domains)[0]+".key"),
crtFile: path.Join(*baseDir, "certs", (*domains)[0]+".pem"),
}