X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e889ec14bbd18cf82acfabc681d0db967772692d..a12d68dd2e2646beb4ae68e4dd0825272e279508:/services/arv-git-httpd/server.go diff --git a/services/arv-git-httpd/server.go b/services/arv-git-httpd/server.go index 9e80481075..e2311d22e8 100644 --- a/services/arv-git-httpd/server.go +++ b/services/arv-git-httpd/server.go @@ -2,7 +2,7 @@ package main import ( "net/http" - "net/http/cgi" + "git.curoverse.com/arvados.git/sdk/go/httpserver" ) @@ -11,19 +11,9 @@ 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()}) srv.Handler = mux - srv.Addr = theConfig.Addr + srv.Addr = theConfig.Listen return srv.Server.Start() }