Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Update to latest lego changes

Browse source
This commit is contained in:
xenolf 2015-11-02 01:41:02 +01:00
parent 9a4e26a518
commit cac58eaab9
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
caddy/letsencrypt/letsencrypt.go
View file

@ -7,6 +7,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"io/ioutil" "io/ioutil"
"log"
"net/http" "net/http"
"os" "os"
"strings" "strings"
@ -83,9 +84,11 @@ func Activate(configs []server.Config) ([]server.Config, error) {
} }
// client is ready, so let's get free, trusted SSL certificates! yeah! // client is ready, so let's get free, trusted SSL certificates! yeah!
certificates, err := obtainCertificates(client, serverConfigs) certificates, failures := obtainCertificates(client, serverConfigs)
if err != nil { if len(failures) > 0 {
return configs, errors.New("error getting certs: " + err.Error()) for k, v := range failures {
log.Printf("[%s] Failed to get a certificate: %s", k, v)
}
} }
// ... that's it. save the certs, keys, and metadata files to disk // ... that's it. save the certs, keys, and metadata files to disk
@ -234,19 +237,14 @@ func newClient(leEmail string) (*acme.Client, error) {
// obtainCertificates obtains certificates from the CA server for // obtainCertificates obtains certificates from the CA server for
// the configurations in serverConfigs using client. // the configurations in serverConfigs using client.
func obtainCertificates(client *acme.Client, serverConfigs []*server.Config) ([]acme.CertificateResource, error) { func obtainCertificates(client *acme.Client, serverConfigs []*server.Config) ([]acme.CertificateResource, map[string]error) {
// collect all the hostnames into one slice // collect all the hostnames into one slice
var hosts []string var hosts []string
for _, cfg := range serverConfigs { for _, cfg := range serverConfigs {
hosts = append(hosts, cfg.Host) hosts = append(hosts, cfg.Host)
} }
certificates, err := client.ObtainCertificates(hosts, true) return client.ObtainCertificates(hosts, true)
if err != nil {
return nil, errors.New("error obtaining certs: " + err.Error())
}
return certificates, nil
} }
// saveCertificates saves each certificate resource to disk. This // saveCertificates saves each certificate resource to disk. This