projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15924: Change import paths to git.arvados.org.
[arvados.git]
/
services
/
arv-git-httpd
/
server.go
diff --git
a/services/arv-git-httpd/server.go
b/services/arv-git-httpd/server.go
index 8f0d90f89e29cad0a0d8d590b66e412b02195ad2..38a018ab3d5189a9b60a33368b92ae62247112e3 100644
(file)
--- a/
services/arv-git-httpd/server.go
+++ b/
services/arv-git-httpd/server.go
@@
-7,22
+7,30
@@
package main
import (
"net/http"
import (
"net/http"
- "git.curoverse.com/arvados.git/sdk/go/health"
- "git.curoverse.com/arvados.git/sdk/go/httpserver"
+ "git.arvados.org/arvados.git/sdk/go/arvados"
+ "git.arvados.org/arvados.git/sdk/go/health"
+ "git.arvados.org/arvados.git/sdk/go/httpserver"
)
type server struct {
httpserver.Server
)
type server struct {
httpserver.Server
+ cluster *arvados.Cluster
}
func (srv *server) Start() error {
mux := http.NewServeMux()
}
func (srv *server) Start() error {
mux := http.NewServeMux()
- mux.Handle("/", &authHandler{handler: newGitHandler(
)
})
+ mux.Handle("/", &authHandler{handler: newGitHandler(
srv.cluster), cluster: srv.cluster
})
mux.Handle("/_health/", &health.Handler{
mux.Handle("/_health/", &health.Handler{
- Token:
theConfig
.ManagementToken,
+ Token:
srv.cluster
.ManagementToken,
Prefix: "/_health/",
})
Prefix: "/_health/",
})
+
+ var listen arvados.URL
+ for listen = range srv.cluster.Services.GitHTTP.InternalURLs {
+ break
+ }
+
srv.Handler = mux
srv.Handler = mux
- srv.Addr =
theConfig.Listen
+ srv.Addr =
listen.Host
return srv.Server.Start()
}
return srv.Server.Start()
}