21578: Merge branch 'main' into 21578-mount-debug

[arvados.git] / lib / config / deprecated.go

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index d53e7ae34096363f5f22c810d02d2da75c682f58..d518b3414ad193795179f7e9776bccc26fedc129 100644 (file)
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -494,17 +494,8 @@ 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
+               cluster.Collections.WebDAVCache.MaxCollectionBytes = arvados.ByteSize(*oc.Cache.MaxCollectionBytes)
        }
        if oc.AnonymousTokens != nil {
                if len(*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 {