X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5722e7f91d3ab4df898dec0d301c0653ac7995b3..a86a6544f54720c5941a32187235ef5287caee07:/lib/service/tls.go

diff --git a/lib/service/tls.go b/lib/service/tls.go
index 21cd3e2ac2..88a2858beb 100644
--- a/lib/service/tls.go
+++ b/lib/service/tls.go
@@ -21,7 +21,7 @@ import (
 )
 
 func makeTLSConfig(cluster *arvados.Cluster, logger logrus.FieldLogger) (*tls.Config, error) {
-	if cluster.TLS.Automatic {
+	if cluster.TLS.ACME.Server != "" {
 		return makeAutocertConfig(cluster, logger)
 	} else {
 		return makeFileLoaderConfig(cluster, logger)
@@ -75,9 +75,6 @@ func makeFileLoaderConfig(cluster *arvados.Cluster, logger logrus.FieldLogger) (
 
 	key := strings.TrimPrefix(cluster.TLS.Key, "file://")
 	cert := strings.TrimPrefix(cluster.TLS.Certificate, "file://")
-	if !strings.HasPrefix(key, "file://") || !strings.HasPrefix(cert, "file://") {
-	}
-	key, cert = key[7:], cert[7:]
 
 	update := func() error {
 		cert, err := tls.LoadX509KeyPair(cert, key)