diff --git a/caddyhttp/httpserver/https.go b/caddyhttp/httpserver/https.go index b1ae5369e..3a6ebb707 100644 --- a/caddyhttp/httpserver/https.go +++ b/caddyhttp/httpserver/https.go @@ -1,6 +1,7 @@ package httpserver import ( + "fmt" "net" "net/http" @@ -9,6 +10,10 @@ import ( ) func activateHTTPS(cctx caddy.Context) error { + if !caddy.Quiet { + fmt.Print("Activating privacy features...") + } + ctx := cctx.(*httpContext) // pre-screen each config and earmark the ones that qualify for managed TLS @@ -39,6 +44,9 @@ func activateHTTPS(cctx caddy.Context) error { return err } + if !caddy.Quiet { + fmt.Println(" done.") + } return nil } diff --git a/caddyhttp/httpserver/plugin.go b/caddyhttp/httpserver/plugin.go index de78d9b5a..b983d5d20 100644 --- a/caddyhttp/httpserver/plugin.go +++ b/caddyhttp/httpserver/plugin.go @@ -225,11 +225,6 @@ func groupSiteConfigsByListenAddr(configs []*SiteConfig) (map[string][]*SiteConf return groups, nil } -// AddMiddleware adds a middleware to a site's middleware stack. -func (sc *SiteConfig) AddMiddleware(m Middleware) { - sc.middleware = append(sc.middleware, m) -} - // Address represents a site address. It contains // the original input value, and the component // parts of an address. The component parts may be diff --git a/caddyhttp/httpserver/siteconfig.go b/caddyhttp/httpserver/siteconfig.go index dffe74901..6c683d0d7 100644 --- a/caddyhttp/httpserver/siteconfig.go +++ b/caddyhttp/httpserver/siteconfig.go @@ -32,6 +32,11 @@ type SiteConfig struct { HiddenFiles []string } +// AddMiddleware adds a middleware to a site's middleware stack. +func (s *SiteConfig) AddMiddleware(m Middleware) { + s.middleware = append(s.middleware, m) +} + // TLSConfig returns s.TLS. func (s SiteConfig) TLSConfig() *caddytls.Config { return s.TLS