From: Tom Clegg <tom@curii.com>
Date: Thu, 30 Jun 2022 20:02:26 +0000 (-0400)
Subject: 16552: Add arvados-server init -admin-email option.
X-Git-Tag: 2.5.0~116^2~13
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/bd5f21b6a567248d05126d78bab091555764a052

16552: Add arvados-server init -admin-email option.

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

diff --git a/lib/install/init.go b/lib/install/init.go
index 73483d3b3b..b2de067ff6 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -36,6 +36,7 @@ type initCommand struct {
 	PostgreSQLPassword string
 	Login              string
 	TLS                string
+	AdminEmail         string
 	Start              bool
 
 	LoginPAM                bool
@@ -70,6 +71,7 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
 	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, 'google {client-id} {client-secret}', or ''")
+	flags.StringVar(&initcmd.AdminEmail, "admin-email", "", "give admin privileges to user with given `email`")
 	flags.StringVar(&initcmd.TLS, "tls", "none", "tls certificate `source`: acme, auto, insecure, or none")
 	flags.BoolVar(&initcmd.Start, "start", true, "start systemd service after creating config")
 	if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok {
@@ -87,6 +89,9 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
 		initcmd.LoginGoogleClientSecret = fields[2]
 	} else if initcmd.Login == "test" {
 		initcmd.LoginTest = true
+		if initcmd.AdminEmail == "" {
+			initcmd.AdminEmail = "admin@example.com"
+		}
 	} else if initcmd.Login == "pam" {
 		initcmd.LoginPAM = true
 	} else if initcmd.Login == "" {
@@ -235,7 +240,7 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
         Enable: true
         Users:
           admin:
-            Email: admin@example.com
+            Email: {{printf "%q" .AdminEmail}}
             Password: admin
     {{else if .LoginGoogle}}
     Login:
@@ -244,10 +249,8 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
         ClientID: {{printf "%q" .LoginGoogleClientID}}
         ClientSecret: {{printf "%q" .LoginGoogleClientSecret}}
     {{end}}
-    {{if .LoginTest}}
     Users:
-      AutoAdminUserWithEmail: admin@example.com
-    {{end}}
+      AutoAdminUserWithEmail: {{printf "%q" .AdminEmail}}
 `)
 	if err != nil {
 		return 1