Skip to content

Commit

Permalink
[v11] Backports (#1248)
Browse files Browse the repository at this point in the history
ryanclark authored Oct 11, 2022
1 parent 045623f commit dcb36ce
Showing 3 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -7,9 +7,10 @@ import { useJoinTokenValue } from 'teleport/Discover/Desktop/ConnectTeleport/Joi

import type { JoinToken } from 'teleport/services/joinToken';

const pastedLines = (joinToken: JoinToken) => `teleport:
const pastedLines = (joinToken: JoinToken) => `version: v3
teleport:
auth_token: ${joinToken.id}
auth_servers: [ ${window.location.hostname}:${window.location.port || '443'} ]
proxy_server: ${window.location.hostname}:${window.location.port || '443'}
auth_service:
enabled: no
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ export function RunConfigureScript(
if (timedOut) {
content = (
<StepInstructions>
<Text>That script expired.</Text>
<Text mb={4}>That script expired.</Text>

<ButtonPrimary onClick={reloadJoinToken}>
Generate another
Original file line number Diff line number Diff line change
@@ -25,9 +25,10 @@ const lines = (joinToken: JoinToken) => [
},
{
text: `
version: v3
teleport:
auth_token: ${joinToken.id}
auth_servers: [ ${window.location.hostname}:${window.location.port || '443'} ]
proxy_server: ${window.location.hostname}:${window.location.port || '443'}
auth_service:
enabled: no
@@ -67,7 +68,7 @@ windows_desktop_service:

const selectedLines = {
start: 4,
end: 28,
end: 29,
};

const highlights: KeywordHighlight[] = [

0 comments on commit dcb36ce

Please sign in to comment.