Merge branch '10671-pipeline-instance-finish-time'

[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 e3cd58299bca3be27c59a3df3af607734c0399b9..e2311d22e876861ecbe8749b8f552aff2c2c2871 100644 (file)
--- 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,25 +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=",
-                       "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.Handler = mux
-       srv.Addr = theConfig.Addr
+       srv.Addr = theConfig.Listen
        return srv.Server.Start()
 }