X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ca35c58c19b28dcdbbff71fe3da0ee16ca760673..0fe48142de81e20967eaac3972e35d115aaaa497:/services/arv-git-httpd/server.go diff --git a/services/arv-git-httpd/server.go b/services/arv-git-httpd/server.go index c3c36dac5a..8f0d90f89e 100644 --- a/services/arv-git-httpd/server.go +++ b/services/arv-git-httpd/server.go @@ -1,9 +1,13 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + package main import ( "net/http" - "net/http/cgi" + "git.curoverse.com/arvados.git/sdk/go/health" "git.curoverse.com/arvados.git/sdk/go/httpserver" ) @@ -12,19 +16,13 @@ type server struct { } 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.Handle("/", &authHandler{gitHandler}) + mux.Handle("/", &authHandler{handler: newGitHandler()}) + mux.Handle("/_health/", &health.Handler{ + Token: theConfig.ManagementToken, + Prefix: "/_health/", + }) srv.Handler = mux - srv.Addr = theConfig.Addr + srv.Addr = theConfig.Listen return srv.Server.Start() }