10234: Pass through gitolite env vars so old env-var-configured sites continue working.

[arvados.git] / services / keep-web / server.go

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 44da00fb16ca369dd0791f9a566629e7472e6d21..babc68b6b59d37a14f17ac26f8cc49dc1485b4ca 100644 (file)
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -1,27 +1,16 @@
 package main
 
 import (
-       "flag"
-       "net/http"
-
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
 )
 
-var address string
-
-func init() {
-       flag.StringVar(&address, "address", "0.0.0.0:80",
-               "Address to listen on, \"host:port\".")
-}
-
 type server struct {
        httpserver.Server
+       Config *Config
 }
 
 func (srv *server) Start() error {
-       mux := http.NewServeMux()
-       mux.Handle("/", &handler{})
-       srv.Handler = mux
-       srv.Addr = address
+       srv.Handler = &handler{Config: srv.Config}
+       srv.Addr = srv.Config.Listen
        return srv.Server.Start()
 }