16306: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc lib/boot/supervisor.go
index e892d3e6239af78062936acabca66299f74a2c26,f2e715a76669ed7ea1db21a7720b3fbd382cb8a3..838808df58c267b1939dc2df443f8ba431f41d33
--- 1/lib/boot/supervisor.go
--- 2/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@@ -244,11 -222,11 +244,11 @@@ func (super *Supervisor) run(cfg *arvad
                runGoProgram{src: "services/keepproxy", svc: super.cluster.Services.Keepproxy, depends: []supervisedTask{runPassenger{src: "services/api"}}},
                runGoProgram{src: "services/keepstore", svc: super.cluster.Services.Keepstore},
                runGoProgram{src: "services/keep-web", svc: super.cluster.Services.WebDAV},
-               runServiceCommand{name: "ws", svc: super.cluster.Services.Websocket, depends: []supervisedTask{runPostgreSQL{}}},
+               runServiceCommand{name: "ws", svc: super.cluster.Services.Websocket, depends: []supervisedTask{seedDatabase{}}},
                installPassenger{src: "services/api"},
-               runPassenger{src: "services/api", varlibdir: "railsapi", svc: super.cluster.Services.RailsAPI, depends: []supervisedTask{createCertificates{}, runPostgreSQL{}, installPassenger{src: "services/api"}}},
-               installPassenger{src: "apps/workbench", depends: []supervisedTask{installPassenger{src: "services/api"}}}, // dependency ensures workbench doesn't delay api startup
 -              runPassenger{src: "services/api", svc: super.cluster.Services.RailsAPI, depends: []supervisedTask{createCertificates{}, seedDatabase{}, installPassenger{src: "services/api"}}},
++              runPassenger{src: "services/api", varlibdir: "railsapi", svc: super.cluster.Services.RailsAPI, depends: []supervisedTask{createCertificates{}, seedDatabase{}, installPassenger{src: "services/api"}}},
+               installPassenger{src: "apps/workbench", depends: []supervisedTask{seedDatabase{}}}, // dependency ensures workbench doesn't delay api install/startup
 -              runPassenger{src: "apps/workbench", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench"}}},
 +              runPassenger{src: "apps/workbench", varlibdir: "workbench1", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench"}}},
                seedDatabase{},
        }
        if super.ClusterType != "test" {
@@@ -682,26 -605,27 +682,26 @@@ func (super *Supervisor) autofillConfig
                        }
                }
        }
 -      if cluster.SystemRootToken == "" {
 -              cluster.SystemRootToken = randomHexString(64)
 -      }
 -      if cluster.ManagementToken == "" {
 -              cluster.ManagementToken = randomHexString(64)
 -      }
 -      if cluster.Collections.BlobSigningKey == "" {
 -              cluster.Collections.BlobSigningKey = randomHexString(64)
 -      }
 -      if cluster.Users.AnonymousUserToken == "" {
 -              cluster.Users.AnonymousUserToken = randomHexString(64)
 -      }
 -
 -      if super.ClusterType != "production" && cluster.Containers.DispatchPrivateKey == "" {
 -              buf, err := ioutil.ReadFile(filepath.Join(super.SourcePath, "lib", "dispatchcloud", "test", "sshkey_dispatch"))
 -              if err != nil {
 -                      return err
 -              }
 -              cluster.Containers.DispatchPrivateKey = string(buf)
 -      }
        if super.ClusterType != "production" {
-               if cluster.API.RailsSessionSecretToken == "" {
-                       cluster.API.RailsSessionSecretToken = randomHexString(64)
-               }
 +              if cluster.SystemRootToken == "" {
 +                      cluster.SystemRootToken = randomHexString(64)
 +              }
 +              if cluster.ManagementToken == "" {
 +                      cluster.ManagementToken = randomHexString(64)
 +              }
 +              if cluster.Collections.BlobSigningKey == "" {
 +                      cluster.Collections.BlobSigningKey = randomHexString(64)
 +              }
++              if cluster.Users.AnonymousUserToken == "" {
++                      cluster.Users.AnonymousUserToken = randomHexString(64)
++              }
 +              if cluster.Containers.DispatchPrivateKey == "" {
 +                      buf, err := ioutil.ReadFile(filepath.Join(super.SourcePath, "lib", "dispatchcloud", "test", "sshkey_dispatch"))
 +                      if err != nil {
 +                              return err
 +                      }
 +                      cluster.Containers.DispatchPrivateKey = string(buf)
 +              }
                cluster.TLS.Insecure = true
        }
        if super.ClusterType == "test" {