From 733b87bc043770715f2e6b51ac6f640ab778e6a2 Mon Sep 17 00:00:00 2001 From: mcbattirola Date: Tue, 30 Jul 2024 16:07:36 -0300 Subject: [PATCH] Update install script references to use CDN --- .github/workflows/post-release.yaml | 3 ++- docs/config.json | 5 +++-- docs/pages/deploy-a-cluster/linux-demo.mdx | 2 +- docs/pages/includes/install-linux-oss.mdx | 2 +- docs/pages/includes/install-linux.mdx | 2 +- docs/pages/installation.mdx | 2 +- docs/pages/upgrading/automatic-agent-updates.mdx | 2 +- docs/pages/upgrading/reference.mdx | 2 +- examples/agent-pool-terraform/teleport/userdata | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/post-release.yaml b/.github/workflows/post-release.yaml index d04e66d573acd..05e12675db625 100644 --- a/.github/workflows/post-release.yaml +++ b/.github/workflows/post-release.yaml @@ -104,7 +104,8 @@ jobs: .variables.teleport.latest_oss_docker_image |= sub(":.*";":")+$version | .variables.teleport.latest_oss_debug_docker_image |= sub(":.*";":")+$version | .variables.teleport.latest_ent_docker_image |= sub(":.*";":")+$version | - .variables.teleport.latest_ent_debug_docker_image |= sub(":.*";":")+$version' \ + .variables.teleport.latest_ent_debug_docker_image |= sub(":.*";":")+$version | + .variables.teleport.teleport_install_script_url |= sub("install-v.*.sh"; "install-v"+$version+".sh")' \ docs/config.json > docs/confignew.json cat docs/confignew.json mv docs/confignew.json docs/config.json diff --git a/docs/config.json b/docs/config.json index 616e5c93d019a..15280533b9860 100644 --- a/docs/config.json +++ b/docs/config.json @@ -1352,7 +1352,8 @@ "latest_oss_docker_image": "public.ecr.aws/gravitational/teleport-distroless:13.3.7", "latest_oss_debug_docker_image": "public.ecr.aws/gravitational/teleport-distroless-debug:13.3.7", "latest_ent_docker_image": "public.ecr.aws/gravitational/teleport-ent-distroless:13.3.7", - "latest_ent_debug_docker_image": "public.ecr.aws/gravitational/teleport-ent-distroless-debug:13.3.7" + "latest_ent_debug_docker_image": "public.ecr.aws/gravitational/teleport-ent-distroless-debug:13.3.7", + "teleport_install_script_url": "https://cdn.teleport.dev/install-v15.4.11.sh" }, "terraform": { "version": "1.0.0" @@ -2675,4 +2676,4 @@ "permanent": true } ] -} +} \ No newline at end of file diff --git a/docs/pages/deploy-a-cluster/linux-demo.mdx b/docs/pages/deploy-a-cluster/linux-demo.mdx index 2632218545855..4e3c751d5a9e8 100644 --- a/docs/pages/deploy-a-cluster/linux-demo.mdx +++ b/docs/pages/deploy-a-cluster/linux-demo.mdx @@ -88,7 +88,7 @@ set up records for: On your Linux host, run the following command to install the Teleport binary: ```code -$ curl https://goteleport.com/static/install.sh | bash -s (=teleport.version=) +$ curl (=teleport.teleport_install_script_url=) | bash -s (=teleport.version=) ``` ### Configure Teleport diff --git a/docs/pages/includes/install-linux-oss.mdx b/docs/pages/includes/install-linux-oss.mdx index a14d4c32c61be..d63d205e9cc28 100644 --- a/docs/pages/includes/install-linux-oss.mdx +++ b/docs/pages/includes/install-linux-oss.mdx @@ -2,6 +2,6 @@ The following command updates the repository for the package manager on the local operating system and installs the provided Teleport version: ```code -$ curl https://goteleport.com/static/install.sh | bash -s (=teleport.version=) +$ curl (=teleport.teleport_install_script_url=) | bash -s (=teleport.version=) ``` diff --git a/docs/pages/includes/install-linux.mdx b/docs/pages/includes/install-linux.mdx index 28a1b1804a4e5..e7091bb737b52 100644 --- a/docs/pages/includes/install-linux.mdx +++ b/docs/pages/includes/install-linux.mdx @@ -28,7 +28,7 @@ Install Teleport on your Linux server: 1. Install Teleport on your Linux server: ```code - $ curl https://goteleport.com/static/install.sh | bash -s ${TELEPORT_VERSION} + $ curl (=teleport.teleport_install_script_url=) | bash -s ${TELEPORT_VERSION} ``` The installation script detects the package manager on your Linux server and diff --git a/docs/pages/installation.mdx b/docs/pages/installation.mdx index 4b851ef016523..6d78aeca9424d 100644 --- a/docs/pages/installation.mdx +++ b/docs/pages/installation.mdx @@ -126,7 +126,7 @@ Download and run the installation script on the server where you want to install Teleport: ```code -$ curl https://goteleport.com/static/install.sh | bash -s ${TELEPORT_VERSION?} ${TELEPORT_EDITION?} +$ curl (=teleport.teleport_install_script_url=) | bash -s ${TELEPORT_VERSION?} ${TELEPORT_EDITION?} ``` ### Package repositories diff --git a/docs/pages/upgrading/automatic-agent-updates.mdx b/docs/pages/upgrading/automatic-agent-updates.mdx index 86f2174bb335d..3260f4149ed5d 100644 --- a/docs/pages/upgrading/automatic-agent-updates.mdx +++ b/docs/pages/upgrading/automatic-agent-updates.mdx @@ -183,7 +183,7 @@ Server ID Hostname Services Version Upgrader ```code - $ curl https://goteleport.com/static/install.sh | bash -s ${TELEPORT_VERSION?} cloud + $ curl (=teleport.teleport_install_script_url=) | bash -s ${TELEPORT_VERSION?} cloud ``` diff --git a/docs/pages/upgrading/reference.mdx b/docs/pages/upgrading/reference.mdx index 5ed1618a08e84..d6635b32442e1 100644 --- a/docs/pages/upgrading/reference.mdx +++ b/docs/pages/upgrading/reference.mdx @@ -327,7 +327,7 @@ Service, then on each of your agents: 1. Install the new Teleport version on your Linux server: ```code - $ curl https://goteleport.com/static/install.sh | bash -s + $ curl (=teleport.teleport_install_script_url=) | bash -s ``` The installation script detects the package manager on your Linux server and diff --git a/examples/agent-pool-terraform/teleport/userdata b/examples/agent-pool-terraform/teleport/userdata index b68110177dc46..c417d6119e6cf 100644 --- a/examples/agent-pool-terraform/teleport/userdata +++ b/examples/agent-pool-terraform/teleport/userdata @@ -1,6 +1,6 @@ #!/bin/bash -curl https://goteleport.com/static/install.sh | bash -s ${teleport_version} ${teleport_edition} +curl https://cdn.teleport.dev/install-v${teleport_version}.sh | bash -s ${teleport_version} ${teleport_edition} echo ${token} > /var/lib/teleport/token cat</etc/teleport.yaml