From c8c1ea5fc84b44980c017d3355fde25fbd1cb124 Mon Sep 17 00:00:00 2001 From: Steven Martin Date: Mon, 6 Feb 2023 18:39:33 -0500 Subject: [PATCH] Show enterprise installs for Cloud scope MacOS Installs (#19669) * Recommends enterprise version for MacOS cloud installs that matches to the Cloud Downloads * lint fix * copy edits... Shortened Homebrew section and consolidated, updated direct download links * uncomment command output * verbiage change Co-authored-by: Paul Gottschling * Fix tabs * remove homebrew include --------- Co-authored-by: alexfornuto Co-authored-by: Paul Gottschling --- .../includes/enterprise/install-macos.mdx | 20 ++++ docs/pages/installation.mdx | 112 +++++------------- 2 files changed, 52 insertions(+), 80 deletions(-) create mode 100644 docs/pages/includes/enterprise/install-macos.mdx diff --git a/docs/pages/includes/enterprise/install-macos.mdx b/docs/pages/includes/enterprise/install-macos.mdx new file mode 100644 index 00000000000..928d9bfe641 --- /dev/null +++ b/docs/pages/includes/enterprise/install-macos.mdx @@ -0,0 +1,20 @@ + You can download one of the following .pkg installers for macOS: + + | Link | Binaries | + |-----------------------------------------------------------------------------------------------------------|--------------------------------------------| + | [`teleport-ent-(=teleport.version=).pkg`](https://cdn.teleport.dev/teleport-ent-(=teleport.version=).pkg) | `teleport`
`tctl`
`tsh`
`tbot` | + | [`tsh-(=teleport.version=).pkg`](https://cdn.teleport.dev/tsh-(=teleport.version=).pkg) | `tsh` | + + You can also fetch an installer from the command line: + + ```code + $ curl -O https://cdn.teleport.dev/teleport-ent-(=teleport.version=).pkg + # Install on Macintosh HD + $ sudo installer -pkg teleport-ent-(=teleport.version=).pkg -target / + Password: + installer: Package name is teleport-ent-(=teleport.version=) + installer: Upgrading at base path / + installer: The upgrade was successful. + $ which teleport + /usr/local/bin/teleport + ``` diff --git a/docs/pages/installation.mdx b/docs/pages/installation.mdx index 2dde2c82a39..ba84a168ee2 100644 --- a/docs/pages/installation.mdx +++ b/docs/pages/installation.mdx @@ -104,8 +104,9 @@ chart. ## macOS - - + + + You can download one of the following .pkg installers for macOS: @@ -132,96 +133,47 @@ chart. + - +The Teleport package in Homebrew is not maintained by Teleport and we can't +guarantee its reliability or security. We recommend the use of our [official +Teleport packages](https://goteleport.com/teleport/download?os=mac). - The Teleport package in Homebrew is not maintained by Teleport and we can't - guarantee its reliability or security. We recommend the use of our [official - Teleport packages](https://goteleport.com/download?os=mac). + - +The Homebrew version of Teleport lacks the ability to maintain SAML/OIDC authentication +connectors through the `tctl` binary. We recommend installing the official Teleport Enterprise edition of `tctl`. - Run the following command: + - ```code - $ brew install teleport - ``` + - If you choose to use Homebrew, you must verify that the versions of `tsh` - and `tctl` you run on your local machine are compatible with the versions - you run on your infrastructure. Homebrew usually ships the latest release of - Teleport, which may be incompatible with older versions. See our - [compatibility policy](./management/operations/upgrading.mdx) for details. +To install Teleport with Homebrew, run the following command: - Log in to your cluster: +```code +$ brew install teleport +``` - +If you choose to use Homebrew, you must verify that the versions of `tsh` +and `tctl` you run on your local machine are compatible with the versions +you run on your infrastructure. Homebrew usually ships the latest release of +Teleport, which may be incompatible with older versions. See our +[compatibility policy](../management/operations/upgrading.mdx) for details. - ```code - $ tsh login --proxy=mytenant.teleport.sh --user=myuser - ``` +To verify versions, log in to your cluster and compare the output of `tctl status` +against `tsh version` and `tctl version`. - - - - ```code - $ tsh login --proxy=teleport.example.com --user=myuser - ``` - - - - Get the version of your Teleport cluster: - - - - ```code - $ tctl status - tctl status - Cluster mytenant.teleport.sh - Version (=teleport.version=) - Host CA never updated - User CA never updated - Jwt CA never updated - CA pin (=presets.ca_pin=) - ``` - - - - - ```code - $ tctl status - tctl status - Cluster teleport.example.com - Version (=teleport.version=) - Host CA never updated - User CA never updated - Jwt CA never updated - CA pin (=presets.ca_pin=) - ``` - - - - Get your local tsh version: - - ```code - $ tsh version - Teleport v(=teleport.version=) git:v(=teleport.version=) go(=teleport.golang=) - ``` - - Get your local tctl version: - - ```code - $ tctl version - Teleport v(=teleport.version=) git:v(=teleport.version=) go(=teleport.golang=) - ``` - - + + + + + (!docs/pages/includes/enterprise/install-macos.mdx!) + + + (!docs/pages/includes/enterprise/install-macos.mdx!) + - - -(!docs/pages/includes/enterprise/install-macos-ent.mdx!) - ## Windows (tsh client only)