Merge branch 'master' into 9998-no-count-items-available

[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 c3c36dac5a5cc6c5dd21d852f398f3a927115ba7..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,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()
 }