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 9e804810758d2d077ea4ba14c0ba6d126a4a8d0e..38a018ab3d5189a9b60a33368b92ae62247112e3 100644
(file)
--- a/
services/arv-git-httpd/server.go
+++ b/
services/arv-git-httpd/server.go
@@
-1,29
+1,36
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
package main
import (
"net/http"
package main
import (
"net/http"
- "net/http/cgi"
- "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 {
}
func (srv *server) Start() error {
- gitHandler := &cgi.Handler{
- Path: theConfig.GitCommand,
- Dir: theConfig.Root,
- Env: []string{
- "GIT_PROJECT_ROOT=" + theConfig.Root,
- "GIT_HTTP_EXPORT_ALL=",
- },
- InheritEnv: []string{"PATH"},
- Args: []string{"http-backend"},
- }
mux := http.NewServeMux()
mux := http.NewServeMux()
- mux.Handle("/", &authHandler{gitHandler})
+ mux.Handle("/", &authHandler{handler: newGitHandler(srv.cluster), cluster: srv.cluster})
+ mux.Handle("/_health/", &health.Handler{
+ Token: srv.cluster.ManagementToken,
+ Prefix: "/_health/",
+ })
+
+ var listen arvados.URL
+ for listen = range srv.cluster.Services.GitHTTP.InternalURLs {
+ break
+ }
+
srv.Handler = mux
srv.Handler = mux
- srv.Addr =
theConfig.Addr
+ srv.Addr =
listen.Host
return srv.Server.Start()
}
return srv.Server.Start()
}