diff --git a/caddy/config.go b/caddy/config.go index d7087bfe..d1620379 100644 --- a/caddy/config.go +++ b/caddy/config.go @@ -114,10 +114,19 @@ func loadConfigs(filename string, input io.Reader) ([]server.Config, error) { // the rest of the middlewares so they have correct information regarding // TLS configuration, if necessary. (this call is append-only, so our // iterations below shouldn't be affected) + if !IsRestart() && !Quiet { + fmt.Print("Activating privacy features...") + } configs, err = letsencrypt.Activate(configs) if err != nil { + if !Quiet { + fmt.Println() + } return nil, err } + if !IsRestart() && !Quiet { + fmt.Println(" done.") + } // Finish setting up the rest of the directives, now that TLS is // optimally configured. These loops are similar to above except diff --git a/caddy/letsencrypt/letsencrypt.go b/caddy/letsencrypt/letsencrypt.go index 5a366c6b..c5c4df6d 100644 --- a/caddy/letsencrypt/letsencrypt.go +++ b/caddy/letsencrypt/letsencrypt.go @@ -46,11 +46,6 @@ func Activate(configs []server.Config) ([]server.Config, error) { // just in case previous caller forgot... Deactivate() - // TODO: All the output the end user should see when running caddy is something - // simple like "Setting up HTTPS..." (and maybe 'done' at the end of the line when finished). - // In other words, hide all the other logging except for on errors. Or maybe - // have a place to put those logs. - // reset cached ocsp statuses from any previous activations ocspStatus = make(map[*[]byte]int)