Make NewCertFile config required only when autorenewcert is on, optio…

…nal otherwise. (#372)
ampproject · Nov 15, 2019 · 9df4e34 · 9df4e34
1 parent 0755ca4
commit 9df4e34
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packager/certcache/certcache.go b/packager/certcache/certcache.go
@@ -823,8 +823,12 @@ func (this *CertCache) reloadCertIfExpired() {
 func PopulateCertCache(config *util.Config, key crypto.PrivateKey,
 	developmentMode bool, autoRenewCert bool) (*CertCache, error) {
 
-	if config.CertFile == "" || config.NewCertFile == "" {
-		return nil, errors.New("Missing cert file and new cert file paths in config.")
+	if config.CertFile == "" {
+		return nil, errors.New("Missing cert file path in config.")
+	}
+
+	if autoRenewCert && config.NewCertFile == "" {
+		return nil, errors.New("Missing new cert file path in config.")
 	}
 
 	certs, err := certloader.LoadCertsFromFile(config, developmentMode)