18947: Refactor arv-git-httpd as an arvados-server subcommand.

[arvados.git] / cmd / arvados-server / cmd.go

diff --git a/cmd/arvados-server/cmd.go b/cmd/arvados-server/cmd.go
index c5465ee5615c3ca0a778f48603c66bb788a4b6be..d65e18ddf5640bfd2bf52c1383439f305c740bce 100644 (file)
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@ -21,6 +21,8 @@ import (
        "git.arvados.org/arvados.git/lib/install"
        "git.arvados.org/arvados.git/lib/lsf"
        "git.arvados.org/arvados.git/lib/recovercollection"
+       "git.arvados.org/arvados.git/services/githttpd"
+       "git.arvados.org/arvados.git/services/keepproxy"
        "git.arvados.org/arvados.git/services/keepstore"
        "git.arvados.org/arvados.git/services/ws"
 )
@@ -40,8 +42,10 @@ var (
                "crunch-run":         crunchrun.Command,
                "dispatch-cloud":     dispatchcloud.Command,
                "dispatch-lsf":       lsf.DispatchCommand,
+               "git-httpd":          githttpd.Command,
                "install":            install.Command,
                "init":               install.InitCommand,
+               "keepproxy":          keepproxy.Command,
                "keepstore":          keepstore.Command,
                "recover-collection": recovercollection.Command,
                "workbench2":         wb2command{},