From 2c9f87d769cb653e3bafd03ab2e771835ffa9ae1 Mon Sep 17 00:00:00 2001 From: Elliott Friedman Date: Thu, 11 Jul 2019 14:51:48 -0700 Subject: [PATCH] Update documentation wrt different syntax for flags vs config options --- main.go | 2 +- options.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index f82205d..b4fd906 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ func main() { googleGroups := StringArray{} redisSentinelConnectionURLs := StringArray{} - config := flagSet.String("config", "", "path to config file") + config := flagSet.String("config", "", "path to config file (Note when using config file, options are plural and s/-/_/: email-domain becomes email_domains and is a list)") showVersion := flagSet.Bool("version", false, "print version string") flagSet.String("http-address", "127.0.0.1:4180", "[http://]: or unix:// to listen on for HTTP clients") diff --git a/options.go b/options.go index 7436d85..e4d4659 100644 --- a/options.go +++ b/options.go @@ -213,7 +213,7 @@ func (o *Options) Validate() error { } if o.AuthenticatedEmailsFile == "" && len(o.EmailDomains) == 0 && o.HtpasswdFile == "" { msgs = append(msgs, "missing setting for email validation: email-domain or authenticated-emails-file required."+ - "\n use email-domain=* to authorize all email addresses") + "\n use email-domain=* to authorize all email addresses. If using config file, this should be email_domains=[\"*\"].") } if o.OIDCIssuerURL != "" {