From 8d7d9193eb8e4409e53422b063cddd9e8adf8ca4 Mon Sep 17 00:00:00 2001 From: Zac Bergquist Date: Wed, 24 Jul 2024 09:21:38 -0600 Subject: [PATCH] discover: generate config with --silent flag When you add a node through the discover flow, we use the teleport node configure command to generate a configuration file, and then we actually start Teleport. By default, the configure command prints some hint messages telling the user to run teleport start, but this is not necessary in the discover flow since we start it up for you. The --silent command was added to solve this, but we never went back and updated the install script to use it. Closes #29518 --- lib/web/scripts/node-join/install.sh | 1 + tool/teleport/common/teleport.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/web/scripts/node-join/install.sh b/lib/web/scripts/node-join/install.sh index 899d1919d54c1..f1d82b2b3be58 100755 --- a/lib/web/scripts/node-join/install.sh +++ b/lib/web/scripts/node-join/install.sh @@ -518,6 +518,7 @@ EOF install_teleport_node_config() { log "Writing Teleport node service config to ${TELEPORT_CONFIG_PATH}" ${TELEPORT_BINARY_DIR}/teleport node configure \ + --silent \ --token ${JOIN_TOKEN} \ ${JOIN_METHOD_FLAG} \ --ca-pin ${CA_PINS} \ diff --git a/tool/teleport/common/teleport.go b/tool/teleport/common/teleport.go index a5d70be4ee622..3c72c7cebc86d 100644 --- a/tool/teleport/common/teleport.go +++ b/tool/teleport/common/teleport.go @@ -907,7 +907,7 @@ func onConfigDump(flags dumpFlags) error { fmt.Fprintf(flags.stdout, "- The Teleport configuration is located at %q.\n", configPath) } if !canWriteToDataDir { - fmt.Fprintf(flags.stdout, "- Teleport will be storing data at %q. To change that, run \"teleport configure\" with the \"--data-dir\" flag.\n", flags.DataDir) + fmt.Fprintf(flags.stdout, "- Teleport will be storing data at %q. To change that, edit the \"data_dir\" field in %q.", flags.DataDir, configPath) } fmt.Fprintf(flags.stdout, "\n") } else {