X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/60801a7c485c50e3c2f518f9b3ad6f86c8783fca..571e3176596b852c2f1385487e459126c3d3fd04:/lib/install/init.go

diff --git a/lib/install/init.go b/lib/install/init.go
index 6d4f197576..1d063506b8 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -59,17 +59,10 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
 	versionFlag := flags.Bool("version", false, "Write version information to stdout and exit 0")
 	flags.StringVar(&initcmd.ClusterID, "cluster-id", "", "cluster `id`, like x1234 for a dev cluster")
 	flags.StringVar(&initcmd.Domain, "domain", hostname, "cluster public DNS `name`, like x1234.arvadosapi.com")
-	err = flags.Parse(args)
-	if err == flag.ErrHelp {
-		err = nil
-		return 0
-	} else if err != nil {
-		return 2
+	if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok {
+		return code
 	} else if *versionFlag {
 		return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr)
-	} else if len(flags.Args()) > 0 {
-		err = fmt.Errorf("unrecognized command line arguments: %v", flags.Args())
-		return 2
 	} else if !regexp.MustCompile(`^[a-z][a-z0-9]{4}`).MatchString(initcmd.ClusterID) {
 		err = fmt.Errorf("cluster ID %q is invalid; must be an ASCII letter followed by 4 alphanumerics (try -help)", initcmd.ClusterID)
 		return 1
@@ -149,15 +142,13 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
         InternalURLs:
           "http://0.0.0.0:8001/": {}
         ExternalURL: {{printf "%q" ( print "https://workbench." .Domain "/" ) }}
-      Workbench2:
-        InternalURLs:
-          "http://0.0.0.0:8002/": {}
-        ExternalURL: {{printf "%q" ( print "https://workbench2." .Domain "/" ) }}
+      #Workbench2:
+      #  InternalURLs:
+      #    "http://0.0.0.0:8002/": {}
+      #  ExternalURL: {{printf "%q" ( print "https://workbench2." .Domain "/" ) }}
       Health:
         InternalURLs:
           "http://0.0.0.0:9007/": {}
-    API:
-      RailsSessionSecretToken: {{printf "%q" ( .RandomHex 50 )}}
     Collections:
       BlobSigningKey: {{printf "%q" ( .RandomHex 50 )}}
     Containers:
@@ -170,12 +161,16 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
         user: arvados
         password: {{printf "%q" .PostgreSQLPassword}}
     SystemRootToken: {{printf "%q" ( .RandomHex 50 )}}
+    TLS:
+      Insecure: true
     Volumes:
       {{.ClusterID}}-nyw5e-000000000000000:
         Driver: Directory
         DriverParameters:
           Root: /var/lib/arvados/keep
         Replication: 2
+    Workbench:
+      SecretKeyBase: {{printf "%q" ( .RandomHex 50 )}}
 `)
 	if err != nil {
 		return 1