Merge branch '16265-security-updates' into dependabot/bundler/apps/workbench/loofah...

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

diff --git a/cmd/arvados-server/cmd.go b/cmd/arvados-server/cmd.go
index 1af3745df0c3a4c54d296e848532c1d19c124e43..a9d927d8734401f76fa173bff7214e0038fc4c68 100644 (file)
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@ -7,18 +7,29 @@ package main
 import (
        "os"
 
-       "git.curoverse.com/arvados.git/lib/cmd"
-       "git.curoverse.com/arvados.git/lib/controller"
+       "git.arvados.org/arvados.git/lib/boot"
+       "git.arvados.org/arvados.git/lib/cloud/cloudtest"
+       "git.arvados.org/arvados.git/lib/cmd"
+       "git.arvados.org/arvados.git/lib/config"
+       "git.arvados.org/arvados.git/lib/controller"
+       "git.arvados.org/arvados.git/lib/crunchrun"
+       "git.arvados.org/arvados.git/lib/dispatchcloud"
 )
 
 var (
-       version = "dev"
        handler = cmd.Multi(map[string]cmd.Handler{
-               "version":   cmd.Version(version),
-               "-version":  cmd.Version(version),
-               "--version": cmd.Version(version),
+               "version":   cmd.Version,
+               "-version":  cmd.Version,
+               "--version": cmd.Version,
 
-               "controller": controller.Command,
+               "boot":            boot.Command,
+               "cloudtest":       cloudtest.Command,
+               "config-check":    config.CheckCommand,
+               "config-dump":     config.DumpCommand,
+               "config-defaults": config.DumpDefaultsCommand,
+               "controller":      controller.Command,
+               "crunch-run":      crunchrun.Command,
+               "dispatch-cloud":  dispatchcloud.Command,
        })
 )