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.

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

Backport #10759 to branch/v9 #11966

Merged
merged 3 commits into from
Apr 15, 2022
Merged

Conversation

ptgott
Copy link
Contributor

@ptgott ptgott commented Apr 14, 2022

Backport #10759 to branch/v9

@ptgott ptgott force-pushed the auto-backport/10759-to-branch/v9 branch from 919b806 to 61fc082 Compare April 14, 2022 20:12
@ptgott ptgott enabled auto-merge (squash) April 15, 2022 15:02
@ptgott ptgott force-pushed the auto-backport/10759-to-branch/v9 branch from 61fc082 to 06674b4 Compare April 15, 2022 15:02
ptgott added 3 commits April 15, 2022 16:28
Teleport Daemon

- Use a Notice for a warning re: the Auth Service scoped to
  self-hosted users
- Misc grammar/style/clarity tweaks

Move the Enterprise License File page

The page does not belong in the Setup section, since it does not
apply to Cloud and OSS users. I have moved the page into the
Enterprise section.

Networking guide

- Add tabbed instructions so users who have selected a given scope
  don't see content for other scopes.

- Mention auth_service.proxy_listener_mode instead of
  tls_routing_enabled for self-hosted readers

- Misc grammar, style, and clarity edits

Scaling

  We already added an edition warning in a Details box, but I thought
  a Notice would be more prominent. I've also added some minor grammar,
  style, and clarity tweaks.
- Imply that there are non-Auth/Proxy services beside Nodes
- Remove "shell" where it is unnecessary
- Revert the "HTTP CONNECT" section to where it was before this
  change. The copy-edits were inaccurate, but I don't have time
  to perform the edits agin more carefully.
Simplify the HTTP CONNECT section by bringing the example closer
to the explanation of this functionality and removing some
ambiguity over whether one or both of HTTPS_PROXY and HTTP_PROXY are
required. The original text suggested that either is required, then
that both are required. The new text says to assign both, then
explains why.
@ptgott ptgott force-pushed the auto-backport/10759-to-branch/v9 branch from 06674b4 to 3eb1549 Compare April 15, 2022 20:29
@ptgott ptgott merged commit af0dcf7 into branch/v9 Apr 15, 2022
@ptgott ptgott deleted the auto-backport/10759-to-branch/v9 branch April 15, 2022 20:34
@webvictim webvictim mentioned this pull request Apr 19, 2022
@webvictim webvictim mentioned this pull request Jun 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants