X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b20aa99b4356a2afa092bb355a0db78b0b8f711f..fd2b6e7da193847a9c649d8d19a2831c2e419961:/services/arv-git-httpd/server.go

diff --git a/services/arv-git-httpd/server.go b/services/arv-git-httpd/server.go
index e3cd58299b..38a018ab3d 100644
--- a/services/arv-git-httpd/server.go
+++ b/services/arv-git-httpd/server.go
@@ -1,36 +1,36 @@
+// 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/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
+	cluster *arvados.Cluster
 }
 
 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=",
-			"SERVER_ADDR=" + theConfig.Addr,
-		},
-		InheritEnv: []string{
-			"PATH",
-			// Needed if GitCommand is gitolite-shell:
-			"GITOLITE_HTTP_HOME",
-			"GL_BYPASS_ACCESS_CHECKS",
-		},
-		Args:       []string{"http-backend"},
-	}
 	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.Addr = theConfig.Addr
+	srv.Addr = listen.Host
 	return srv.Server.Start()
 }