Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v15] discover: generate config with --silent flag #44603

Merged
merged 3 commits into from
Jul 27, 2024
Merged

[v15] discover: generate config with --silent flag #44603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d7d919
discover: generate config with --silent flag
zmb3 Jul 24, 2024
05639bf
Merge branch 'branch/v15' into bot/backport-44597-branch/v15
zmb3 Jul 24, 2024
0a074e1
Merge branch 'branch/v15' into bot/backport-44597-branch/v15
zmb3 Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/web/scripts/node-join/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
2 changes: 1 addition & 1 deletion tool/teleport/common/teleport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,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 {
Expand Down
Loading