From 02d727c7ad1c60a9781ae707cdb9f78d403ec494 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 11 Mar 2022 12:17:56 -0500 Subject: [PATCH] 18700: Configure test login. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-package/install.go | 2 +- lib/install/init.go | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go index 0e05f96d64..324f3b4d2d 100644 --- a/cmd/arvados-package/install.go +++ b/cmd/arvados-package/install.go @@ -118,7 +118,7 @@ eatmydata apt-get install --reinstall -y --no-install-recommends arvados-server- SUDO_FORCE_REMOVE=yes apt-get autoremove -y /etc/init.d/postgresql start -arvados-server init -cluster-id x1234 -domain=$domain +arvados-server init -cluster-id x1234 -domain=$domain -login=test exec arvados-server boot -listen-host=0.0.0.0 $bootargs `) cmd.Stdout = stdout diff --git a/lib/install/init.go b/lib/install/init.go index adfa64b3b3..98f9fffd0e 100644 --- a/lib/install/init.go +++ b/lib/install/init.go @@ -33,6 +33,7 @@ type initCommand struct { ClusterID string Domain string PostgreSQLPassword string + Login string } func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int { @@ -59,6 +60,7 @@ 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") + flags.StringVar(&initcmd.Login, "login", "", "login `backend`: test, pam, or ''") if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok { return code } else if *versionFlag { @@ -169,6 +171,26 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read Replication: 2 Workbench: SecretKeyBase: {{printf "%q" ( .RandomHex 50 )}} + Login: + {{if eq .Login "pam"}} + PAM: + Enable: true + {{else if eq .Login "test"}} + Test: + Enable: true + Users: + admin: + Email: admin@example.com + Password: admin + {{else}} + {} + {{end}} + Users: + {{if eq .Login "test"}} + AutoAdminUserWithEmail: admin@example.com + {{else}} + {} + {{end}} `) if err != nil { return 1 -- 2.30.2