X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/590c491796ece16caa4251dd443412f323492fea..acb1d98cdfa6e33bfd3e1bb7510b78a4fd9384e2:/lib/config/deprecated.go

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index 7ae69708eb..019979d39f 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -7,7 +7,6 @@ package config
 import (
 	"fmt"
 	"io/ioutil"
-	"net/url"
 	"os"
 	"strings"
 
@@ -198,18 +197,14 @@ func loadOldClientConfig(cluster *arvados.Cluster, client *arvados.Client) {
 		cluster.SystemRootToken = client.AuthToken
 	}
 	cluster.TLS.Insecure = client.Insecure
-	for _, r := range client.KeepServiceURIs {
-		if cluster.Containers.SLURM.KeepServices == nil {
-			cluster.Containers.SLURM.KeepServices = make(map[string]arvados.Service)
-		}
-		if cluster.Containers.SLURM.KeepServices["00000-bi6l4-000000000000000"].InternalURLs == nil {
-			cluster.Containers.SLURM.KeepServices["00000-bi6l4-000000000000000"] = arvados.Service{InternalURLs: make(map[arvados.URL]arvados.ServiceInstance)}
-		}
-		p, err := url.Parse(r)
-		if err == nil {
-			cluster.Containers.SLURM.KeepServices["00000-bi6l4-000000000000000"].InternalURLs[arvados.URL(*p)] = struct{}{}
+	ks := ""
+	for i, u := range client.KeepServiceURIs {
+		if i > 0 {
+			ks += " "
 		}
+		ks += u
 	}
+	cluster.Containers.SLURM.SbatchEnvironmentVariables = map[string]string{"ARVADOS_KEEP_SERVICES": ks}
 }
 
 // update config using values from an crunch-dispatch-slurm config file.
@@ -331,3 +326,73 @@ func (ldr *Loader) loadOldWebsocketConfig(cfg *arvados.Config) error {
 	cfg.Clusters[cluster.ClusterID] = *cluster
 	return nil
 }
+
+const defaultKeepWebConfigPath = "/etc/arvados/keep-web/keep-web.yml"
+
+type oldKeepWebConfig struct {
+	Client *arvados.Client
+
+	Listen string
+
+	AnonymousTokens    []string
+	AttachmentOnlyHost string
+	TrustAllContent    bool
+
+	Cache struct {
+		TTL                  arvados.Duration
+		UUIDTTL              arvados.Duration
+		MaxCollectionEntries int
+		MaxCollectionBytes   int64
+		MaxPermissionEntries int
+		MaxUUIDEntries       int
+	}
+
+	// Hack to support old command line flag, which is a bool
+	// meaning "get actual token from environment".
+	deprecatedAllowAnonymous bool
+
+	// Authorization token to be included in all health check requests.
+	ManagementToken string
+}
+
+func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
+	if ldr.KeepWebPath == "" {
+		return nil
+	}
+	var oc oldKeepWebConfig
+	err := ldr.loadOldConfigHelper("keep-web", ldr.KeepWebPath, &oc)
+	if os.IsNotExist(err) && ldr.KeepWebPath == defaultKeepWebConfigPath {
+		return nil
+	} else if err != nil {
+		return err
+	}
+
+	cluster, err := cfg.GetCluster("")
+	if err != nil {
+		return err
+	}
+
+	loadOldClientConfig(cluster, oc.Client)
+
+	cluster.Services.WebDAV.InternalURLs[arvados.URL{Host: oc.Listen}] = arvados.ServiceInstance{}
+	cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: oc.Listen}] = arvados.ServiceInstance{}
+	cluster.Services.WebDAVDownload.ExternalURL = arvados.URL{Host: oc.AttachmentOnlyHost}
+	cluster.TLS.Insecure = oc.Client.Insecure
+	cluster.ManagementToken = oc.ManagementToken
+	cluster.Collections.TrustAllContent = oc.TrustAllContent
+	cluster.Collections.WebDAVCache.TTL = oc.Cache.TTL
+	cluster.Collections.WebDAVCache.UUIDTTL = oc.Cache.UUIDTTL
+	cluster.Collections.WebDAVCache.MaxCollectionEntries = oc.Cache.MaxCollectionEntries
+	cluster.Collections.WebDAVCache.MaxCollectionBytes = oc.Cache.MaxCollectionBytes
+	cluster.Collections.WebDAVCache.MaxPermissionEntries = oc.Cache.MaxPermissionEntries
+	cluster.Collections.WebDAVCache.MaxUUIDEntries = oc.Cache.MaxUUIDEntries
+	if len(oc.AnonymousTokens) > 0 {
+		cluster.Users.AnonymousUserToken = oc.AnonymousTokens[0]
+		if len(oc.AnonymousTokens) > 1 {
+			ldr.Logger.Warn("More than 1 anonymous tokens configured, using only the first and discarding the rest.")
+		}
+	}
+
+	cfg.Clusters[cluster.ClusterID] = *cluster
+	return nil
+}