CERBERUS/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-06-29 21:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into log-request-body

Browse source
This commit is contained in:
Carter 2016-08-11 18:08:19 -04:00 • committed by GitHub
commit 8e8e2f596d
6 changed files with 90 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
caddyhttp/httpserver/https.go
View file

@ -10,7 +10,9 @@ import (
)
func activateHTTPS(cctx caddy.Context) error {
if !caddy.Quiet {
operatorPresent := !caddy.Started()
if !caddy.Quiet && operatorPresent {
fmt.Print("Activating privacy features...")
}
@ -21,7 +23,7 @@ func activateHTTPS(cctx caddy.Context) error {
// place certificates and keys on disk
for _, c := range ctx.siteConfigs {
err := c.TLS.ObtainCert(true)
err := c.TLS.ObtainCert(operatorPresent)
if err != nil {
return err
}
@ -44,9 +46,10 @@ func activateHTTPS(cctx caddy.Context) error {
return err
}
if !caddy.Quiet {
if !caddy.Quiet && operatorPresent {
fmt.Println(" done.")
}
return nil
}