X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f6e8752348958e3bb48c7509a4ff78689f2d64c9..cb73538f0851cea402a0544861966c2515a24b5b:/lib/config/deprecated.go

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index d53e7ae340..d5c09d6706 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -494,18 +494,9 @@ func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
 	if oc.Cache.TTL != nil {
 		cluster.Collections.WebDAVCache.TTL = *oc.Cache.TTL
 	}
-	if oc.Cache.UUIDTTL != nil {
-		cluster.Collections.WebDAVCache.UUIDTTL = *oc.Cache.UUIDTTL
-	}
-	if oc.Cache.MaxCollectionEntries != nil {
-		cluster.Collections.WebDAVCache.MaxCollectionEntries = *oc.Cache.MaxCollectionEntries
-	}
 	if oc.Cache.MaxCollectionBytes != nil {
 		cluster.Collections.WebDAVCache.MaxCollectionBytes = *oc.Cache.MaxCollectionBytes
 	}
-	if oc.Cache.MaxUUIDEntries != nil {
-		cluster.Collections.WebDAVCache.MaxUUIDEntries = *oc.Cache.MaxUUIDEntries
-	}
 	if oc.AnonymousTokens != nil {
 		if len(*oc.AnonymousTokens) > 0 {
 			cluster.Users.AnonymousUserToken = (*oc.AnonymousTokens)[0]
@@ -535,7 +526,7 @@ func (ldr *Loader) loadOldGitHttpdConfig(cfg *arvados.Config) error {
 		return nil
 	}
 	var oc oldGitHttpdConfig
-	err := ldr.loadOldConfigHelper("arv-git-httpd", ldr.GitHttpdPath, &oc)
+	err := ldr.loadOldConfigHelper("arvados-git-httpd", ldr.GitHttpdPath, &oc)
 	if os.IsNotExist(err) && ldr.GitHttpdPath == defaultGitHttpdConfigPath {
 		return nil
 	} else if err != nil {