Skip to content

[v13] Join Script: fix tarball folder for ent builds #25077

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

Merged
r0mant merged 1 commit into from
Apr 24, 2023
Merged

[v13] Join Script: fix tarball folder for ent builds #25077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions lib/web/join_tokens_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,7 @@ func TestJoinScript(t *testing.T) {
"https://get.gravitational.com/${TELEPORT_PACKAGE_NAME}-${TELEPORT_VERSION}",
})
require.Contains(t, script, "TELEPORT_PACKAGE_NAME='teleport'")
require.Contains(t, script, "TELEPORT_ARCHIVE_PATH='teleport'")
})

t.Run("ent", func(t *testing.T) {
Expand All @@ -920,6 +921,7 @@ func TestJoinScript(t *testing.T) {
"https://get.gravitational.com/${TELEPORT_PACKAGE_NAME}-${TELEPORT_VERSION}",
})
require.Contains(t, script, "TELEPORT_PACKAGE_NAME='teleport-ent'")
require.Contains(t, script, "TELEPORT_ARCHIVE_PATH='teleport-ent'")
})
})

Expand Down
2 changes: 1 addition & 1 deletion lib/web/scripts/node-join/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MACOS_STDERR_LOG="/var/log/teleport-stderr.log"
MACOS_STDOUT_LOG="/var/log/teleport-stdout.log"
SYSTEMD_UNIT_PATH="/lib/systemd/system/teleport.service"
TARGET_PORT_DEFAULT=443
TELEPORT_ARCHIVE_PATH="teleport"
TELEPORT_ARCHIVE_PATH='{{.packageName}}'
TELEPORT_BINARY_DIR="/usr/local/bin"
TELEPORT_BINARY_LIST="teleport tctl tsh"
TELEPORT_CONFIG_PATH="/etc/teleport.yaml"
Expand Down