fix for go-acme#2283

Author: usarise

cmd/accounts_storage.go

@@ -70,7 +70,7 @@ type AccountsStorage struct {
 // NewAccountsStorage Creates a new AccountsStorage.
 func NewAccountsStorage(ctx *cli.Context) *AccountsStorage {
 	var userID string
-	noEmail := ctx.IsSet("no-email")
+	noEmail := ctx.IsSet(flgNoEmail)
 	if noEmail {
 		userID = "default"
 	} else {

cmd/flags.go

@@ -16,6 +16,7 @@ const (
 	flgServer                   = "server"
 	flgAcceptTOS                = "accept-tos"
 	flgEmail                    = "email"
+	flgNoEmail                  = "no-email"
 	flgCSR                      = "csr"
 	flgEAB                      = "eab"
 	flgKID                      = "kid"
@@ -73,7 +74,7 @@ func CreateFlags(defaultPath string) []cli.Flag {
 			Usage:   "Email used for registration and recovery contact.",
 		},
 		&cli.BoolFlag{
-			Name:    "no-email",
+			Name:    flgNoEmail,
 			Aliases: []string{"M"},
 			EnvVars: []string{"LEGO_NO_EMAIL"},
 			Usage:   "Create an ACME request without including an email address.",

cmd/setup.go

@@ -85,7 +85,7 @@ func getKeyType(ctx *cli.Context) certcrypto.KeyType {
 func getEmail(ctx *cli.Context) string {
 	email := ctx.String(flgEmail)
 	if email == "" {
-		log.Fatalf("You have to pass an account (email address) to the program using --%s or -m", flgEmail)
+		log.Fatalf("You have to pass an account (email address) to the program using --%s or -m, or use --%s or -M to disable including an email in the ACME request.", flgEmail, flgNoEmail)
 	}
 	return email
 }