Merge branch '8784-dir-listings'

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

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 2359f23c761504cca5d8116db420b35607e4a311..0edcf31708b6a0d1e9688536d8523a24827c0a29 100644 (file)
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -1,27 +1,20 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
-       "flag"
-       "net/http"
-
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
 )
 
-var address string
-
-func init() {
-       flag.StringVar(&address, "address", ":80",
-               "Address to listen on: \"host:port\", or \":port\" to listen on all interfaces.")
-}
-
 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()
 }