X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/22cff6bb354d6980c33a0f471d5860f968e853a6..8685bdc41012f1623cc02b573e27439fdf314799:/lib/config/deprecated_keepstore.go diff --git a/lib/config/deprecated_keepstore.go b/lib/config/deprecated_keepstore.go index 29019296d6..186ffc3371 100644 --- a/lib/config/deprecated_keepstore.go +++ b/lib/config/deprecated_keepstore.go @@ -18,7 +18,7 @@ import ( "strings" "time" - "git.curoverse.com/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvados" "github.com/sirupsen/logrus" ) @@ -118,7 +118,7 @@ func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error { return err } - myURL := arvados.URL{Scheme: "http"} + myURL := arvados.URL{Scheme: "http", Path: "/"} if oc.TLSCertificateFile != nil && oc.TLSKeyFile != nil { myURL.Scheme = "https" } @@ -137,7 +137,7 @@ func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error { cluster.TLS.Key = "file://" + *v } if v := oc.Listen; v != nil { - if _, ok := cluster.Services.Keepstore.InternalURLs[arvados.URL{Scheme: myURL.Scheme, Host: *v}]; ok { + if _, ok := cluster.Services.Keepstore.InternalURLs[arvados.URL{Scheme: myURL.Scheme, Host: *v, Path: "/"}]; ok { // already listed myURL.Host = *v } else if len(*v) > 1 && (*v)[0] == ':' { @@ -537,6 +537,7 @@ func keepServiceURL(ks arvados.KeepService) arvados.URL { url := arvados.URL{ Scheme: "http", Host: net.JoinHostPort(ks.ServiceHost, strconv.Itoa(ks.ServicePort)), + Path: "/", } if ks.ServiceSSLFlag { url.Scheme = "https"