X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b20aa99b4356a2afa092bb355a0db78b0b8f711f..6c43be47cb3756a0e6ffc924572259d1a1c8f2c3:/services/arv-git-httpd/server.go diff --git a/services/arv-git-httpd/server.go b/services/arv-git-httpd/server.go index e3cd58299b..40e77a812a 100644 --- a/services/arv-git-httpd/server.go +++ b/services/arv-git-httpd/server.go @@ -2,7 +2,6 @@ package main import ( "net/http" - "net/http/cgi" "git.curoverse.com/arvados.git/sdk/go/httpserver" ) @@ -12,24 +11,8 @@ 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=", - "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{newGitHandler()}) srv.Handler = mux srv.Addr = theConfig.Addr return srv.Server.Start()