20522: Load dispatch key from file if configured as file:///...

[arvados.git] / lib / service / tls.go

diff --git a/lib/service/tls.go b/lib/service/tls.go
index 21cd3e2ac25d8030e766d0a7e572a4de50209db1..88a2858beb13e2f5db216a7645423fd7d2c7c541 100644 (file)
--- 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)