accept TOS based on config option

Author: techknowlogick

cmd/web_letsencrypt.go

@@ -17,16 +17,16 @@ import (
 
 func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler) error {
 
-	// if HTTP Challenge enabled, needs to be serving on port 80. For TLSALPN needs 443
-	// due to docker port mapping this can't be checked programatically
+	// If HTTP Challenge enabled, needs to be serving on port 80. For TLSALPN needs 443.
+	// Due to docker port mapping this can't be checked programatically
 	// TODO: these are placeholders until we add options for each in settings with appropriate warning
 	enableHTTPChallenge := true
 	enableTLSALPNChallenge := false // set to false as this is default prior to using certmagic
 
 	magic := certmagic.NewDefault()
 	myACME := certmagic.NewACMEManager(magic, certmagic.ACMEManager{
 		Email:                   email,
-		Agreed:                  true,
+		Agreed:                  setting.LetsEncryptTOS,
 		DisableHTTPChallenge:    !enableHTTPChallenge,
 		DisableTLSALPNChallenge: !enableTLSALPNChallenge,
 		Storage:                 &certmagic.FileStorage{Path: directory},