pogpp/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

Adjust naming of webroot provider to be in line with DNS providers.

Browse source
This commit is contained in:
xenolf 2016-03-16 11:32:09 +01:00
parent 325db78c91
commit 118d9d5ec9
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli_handlers.go
View file

@ -55,7 +55,7 @@ func setup(c *cli.Context) (*Configuration, *Account, *acme.Client) {
} }
if c.GlobalIsSet("webroot") { if c.GlobalIsSet("webroot") {
provider, err := webroot.NewHTTPProviderWebroot(c.GlobalString("webroot")) provider, err := webroot.NewHTTPProvider(c.GlobalString("webroot"))
if err != nil { if err != nil {
logger().Fatal(err) logger().Fatal(err)
} }

14
providers/http/webroot/webroot.go
View file

@ -10,18 +10,18 @@ import (
"github.com/xenolf/lego/acme" "github.com/xenolf/lego/acme"
) )
// HTTPProviderWebroot implements ChallengeProvider for `http-01` challenge // HTTPProvider implements ChallengeProvider for `http-01` challenge
type HTTPProviderWebroot struct { type HTTPProvider struct {
path string path string
} }
// NewHTTPProviderWebroot returns a HTTPProviderWebroot instance with a configured webroot path // NewHTTPProvider returns a HTTPProvider instance with a configured webroot path
func NewHTTPProviderWebroot(path string) (*HTTPProviderWebroot, error) { func NewHTTPProvider(path string) (*HTTPProvider, error) {
if _, err := os.Stat(path); os.IsNotExist(err) { if _, err := os.Stat(path); os.IsNotExist(err) {
return nil, fmt.Errorf("Webroot path does not exist") return nil, fmt.Errorf("Webroot path does not exist")
} }
c := &HTTPProviderWebroot{ c := &HTTPProvider{
path: path, path: path,
} }
@ -29,7 +29,7 @@ func NewHTTPProviderWebroot(path string) (*HTTPProviderWebroot, error) {
} }
// Present makes the token available at `HTTP01ChallengePath(token)` by creating a file in the given webroot path // Present makes the token available at `HTTP01ChallengePath(token)` by creating a file in the given webroot path
func (w *HTTPProviderWebroot) Present(domain, token, keyAuth string) error { func (w *HTTPProvider) Present(domain, token, keyAuth string) error {
var err error var err error
challengeFilePath := path.Join(w.path, acme.HTTP01ChallengePath(token)) challengeFilePath := path.Join(w.path, acme.HTTP01ChallengePath(token))
@ -47,7 +47,7 @@ func (w *HTTPProviderWebroot) Present(domain, token, keyAuth string) error {
} }
// CleanUp removes the file created for the challenge // CleanUp removes the file created for the challenge
func (w *HTTPProviderWebroot) CleanUp(domain, token, keyAuth string) error { func (w *HTTPProvider) CleanUp(domain, token, keyAuth string) error {
var err error var err error
err = os.Remove(path.Join(w.path, acme.HTTP01ChallengePath(token))) err = os.Remove(path.Join(w.path, acme.HTTP01ChallengePath(token)))
if err != nil { if err != nil {

4
providers/http/webroot/webroot_test.go
View file

@ -6,7 +6,7 @@ import (
"testing" "testing"
) )
func TestHTTPProviderWebRoot(t *testing.T) { func TestHTTPProvider(t *testing.T) {
webroot := "webroot" webroot := "webroot"
domain := "domain" domain := "domain"
token := "token" token := "token"
@ -16,7 +16,7 @@ func TestHTTPProviderWebRoot(t *testing.T) {
os.MkdirAll(webroot+"/.well-known/acme-challenge", 0777) os.MkdirAll(webroot+"/.well-known/acme-challenge", 0777)
defer os.RemoveAll(webroot) defer os.RemoveAll(webroot)
provider, err := NewHTTPProviderWebroot(webroot) provider, err := NewHTTPProvider(webroot)
if err != nil { if err != nil {
t.Errorf("Webroot provider error: got %v, want nil", err) t.Errorf("Webroot provider error: got %v, want nil", err)
} }