From c8daaba4be938ea19791a10df612320e8136ec7e Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Thu, 28 Jul 2016 11:11:14 -0600 Subject: [PATCH] Update link to SA 1.1.1 (and other minor tweaks) --- caddyhttp/proxy/proxy_test.go | 6 +++--- caddytls/storage.go | 11 +++++------ caddytls/user.go | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/caddyhttp/proxy/proxy_test.go b/caddyhttp/proxy/proxy_test.go index b9f799d5..de9fa53b 100644 --- a/caddyhttp/proxy/proxy_test.go +++ b/caddyhttp/proxy/proxy_test.go @@ -664,15 +664,15 @@ func basicAuthTestcase(t *testing.T, upstreamUser, clientUser *url.Userinfo) { })) defer backend.Close() - backUrl, err := url.Parse(backend.URL) + backURL, err := url.Parse(backend.URL) if err != nil { t.Fatalf("Failed to parse URL: %v", err) } - backUrl.User = upstreamUser + backURL.User = upstreamUser p := &Proxy{ Next: httpserver.EmptyNext, - Upstreams: []Upstream{newFakeUpstream(backUrl.String(), false)}, + Upstreams: []Upstream{newFakeUpstream(backURL.String(), false)}, } r, err := http.NewRequest("GET", "/foo", nil) if err != nil { diff --git a/caddytls/storage.go b/caddytls/storage.go index 978eb501..e3336794 100644 --- a/caddytls/storage.go +++ b/caddytls/storage.go @@ -32,18 +32,17 @@ type UserData struct { Key []byte } -// Storage is an interface abstracting all storage used by the Caddy's TLS -// subsystem. Implementations of this interface store site data along with +// Storage is an interface abstracting all storage used by Caddy's TLS +// subsystem. Implementations of this interface store both site and // user data. type Storage interface { - - // SiteDataExists returns true if this site info exists in storage. + // SiteExists returns true if this site exists in storage. // Site data is considered present when StoreSite has been called - // successfully (without DeleteSite having been called of course). + // successfully (without DeleteSite having been called, of course). SiteExists(domain string) bool // LoadSite obtains the site data from storage for the given domain and - // returns. If data for the domain does not exist, the + // returns it. If data for the domain does not exist, the // ErrStorageNotFound error instance is returned. For multi-server // storage, care should be taken to make this load atomic to prevent // race conditions that happen with multiple data loads. diff --git a/caddytls/user.go b/caddytls/user.go index 4ea03daa..cb97b3b6 100644 --- a/caddytls/user.go +++ b/caddytls/user.go @@ -176,4 +176,4 @@ var stdin = io.ReadWriter(os.Stdin) const emptyEmail = "default" // TODO: Use latest -const saURL = "https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf" +const saURL = "https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf"