Skip to content

Commit 8d1a2f8

Browse files
authored
Merge pull request #6304 from Brenduns/quick-fix
Quick fix
2 parents 4d12710 + 0cc0807 commit 8d1a2f8

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

memdocs/intune/protect/microsoft-tunnel-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The Microsoft Tunnel Gateway runs in containers that run on Linux servers.
102102
**Components**:
103103
- **A** – Microsoft Intune.
104104
- **B**- Azure Active Directory (AD).
105-
- **C** – Linux server with Podman (Red Hat Enterprise Linux 8.4 or later) or Docker CE (all other Linux distributions).
105+
- **C** – Linux server with Podman (Red Hat Enterprise Linux 8.4) or Docker CE (all other Linux distributions).
106106
- **C.1** - Microsoft Tunnel Gateway.
107107
- **C.2** – Management Agent.
108108
- **C.3** – Authentication plugin – Authorization plugin, which authenticates with Azure AD.

memdocs/intune/protect/microsoft-tunnel-prerequisites.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ keywords:
55
author: brenduns
66
ms.author: brenduns
77
manager: dougeby
8-
ms.date: 11/23/2021
8+
ms.date: 12/07/2021
99
ms.topic: how-to
1010
ms.service: microsoft-intune
1111
ms.subservice: protect
@@ -34,7 +34,7 @@ At a high level, you’ll need the following to use the Microsoft Tunnel:
3434
- An Azure subscription.
3535
- An Intune subscription.
3636
- A Linux server that runs containers. This server can be on-premises or in the cloud:
37-
- Podman for Red Hat Enterprise Linux (RHEL) 8.4 or later
37+
- Podman for Red Hat Enterprise Linux (RHEL) 8.4
3838
- Docker for all other Linux distributions
3939
- A Transport Layer Security (TLS) certificate for the Linux server to secure connections from devices to the Tunnel Gateway server.
4040
- Devices that run Android or iOS/iPadOS.
@@ -53,7 +53,7 @@ Set up a Linux based virtual machine or a physical server on which Microsoft Tun
5353

5454
- CentOS 7.4+(CentOS 8+ isn’t supported)
5555
- Red Hat (RHEL) 7.4+
56-
- Red Hat (RHEL) 8.4+
56+
- Red Hat (RHEL) 8.4
5757
- Ubuntu 18.04
5858
- Ubuntu 20.04
5959

@@ -72,17 +72,17 @@ Set up a Linux based virtual machine or a physical server on which Microsoft Tun
7272

7373
- **CPU**: 64-bit AMD/Intel processor.
7474

75-
- **Install Docker CE or Podman**: Install Podman version 3.0 on RHEL 8.4 or later. For all other versions of RHEL or other Linux distributions, install Docker version 19.03 CE or later.
76-
Microsoft Tunnel requires Docker (or Podman on RHEL 8.4 or later) on the Linux server to provide support for containers. Containers provide a consistent execution environment, health monitoring and proactive remediation, and a clean upgrade experience.
75+
- **Install Docker CE or Podman**: Install Podman version 3.0 on RHEL 8.4. For all other versions of RHEL or other Linux distributions, install Docker version 19.03 CE or later.
76+
Microsoft Tunnel requires Docker (or Podman on RHEL 8.4) on the Linux server to provide support for containers. Containers provide a consistent execution environment, health monitoring and proactive remediation, and a clean upgrade experience.
7777

7878
For information about installing and configuring Docker or Podman, see:
7979

8080
- [Install Docker Engine on CentOS or Red Hat Enterprise Linux 7]( https://docs.docker.com/engine/install/centos/)
8181
> [!NOTE]
82-
> The preceding link directs you to the CentOS download and installation instructions. Use those same instructions for RHEL 7. The version installed on RHEL 7 by default is too old to support Microsoft Tunnel Gateway. Red Hat Enterprise Linux 8 does not support Docker. For RHEL 8.4 or later, install and use Podman instead.
82+
> The preceding link directs you to the CentOS download and installation instructions. Use those same instructions for RHEL 7. The version installed on RHEL 7 by default is too old to support Microsoft Tunnel Gateway. Red Hat Enterprise Linux 8 does not support Docker. For RHEL 8.4, install and use Podman instead.
8383
- [Install Docker Engine on Ubuntu](https://docs.docker.com/engine/install/ubuntu/)
84-
- [Install Podman on Red Hat Enterprise Linux 8.4 or later (scroll down to RHEL8)](https://podman.io/getting-started/installation).
85-
Podman is the container solution used on RHEL 8.4 and later, and *podman* is part of a module called "container-tools". In this context, a module is a set of RPM packages that represent a component and are usually installed together. A typical module contains packages with an application, packages with the application-specific dependency libraries, packages
84+
- [Install Podman on Red Hat Enterprise Linux 8.4 (scroll down to RHEL8)](https://podman.io/getting-started/installation).
85+
Podman is the container solution used on RHEL 8.4, and *podman* is part of a module called "container-tools". In this context, a module is a set of RPM packages that represent a component and are usually installed together. A typical module contains packages with an application, packages with the application-specific dependency libraries, packages
8686
with documentation for the application, and packages with helper utilities. For more information see [Introduction to modules](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/installing_managing_and_removing_user-space_components/introduction-to-modules_using-appstream) in the Red Hat documentation.
8787

8888
- **Transport Layer Security (TLS) certificate**: The Linux server requires a trusted TLS certificate to secure the connection between devices and the Tunnel Gateway server. You’ll add the TLS certificate, including the full trusted certificate chain, to the server during installation of the Tunnel Gateway.
@@ -184,7 +184,7 @@ You can use a proxy server with Microsoft Tunnel. The following considerations c
184184
185185
### Configure an internal proxy for Podman
186186

187-
The following details can help you configure an internal proxy when using RHEL 8.4 or later, and Podman:
187+
The following details can help you configure an internal proxy when using RHEL 8.4, and Podman:
188188

189189
- Podman reads HTTP Proxy information stored in **/etc/profile.d/http_proxy.sh**. If this file doesn't exist on your server, create it. Edit **http_proxy.sh** to add the following two lines. In the following lines, *10.10.10.1:3128* is an example address:port entry. When you add these lines, replace *10.10.10.1:3128* with the values for your proxy IP *address:port*:
190190

memdocs/intune/protect/microsoft-tunnel-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Following are environment variables you might want to configure when you install
202202
The following are common commands for Docker that can be of use if you must investigate problems on a tunnel server.
203203

204204
> [!NOTE]
205-
> Most Linux distributions use Docker. However, *Red Hat Enterprise Linux (RHEL) 8.4 and later* are not supported to use Docker. Instead, RHEL 8.4 and later use Podman.
205+
> Most Linux distributions use Docker. However, *Red Hat Enterprise Linux (RHEL) 8.4* are not supported to use Docker. Instead, RHEL 8.4 use Podman.
206206
>
207207
> The references and command lines that are written for Docker can be used with Podman by replacing *docker* with *podman*.
208208

memdocs/intune/protect/microsoft-tunnel-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Image hash values:
155155
Changes in this release:
156156

157157
- Added ability to get a client network trace
158-
- Added ability to enabled resoruce access tracking
158+
- Added ability to enabled resource access tracking
159159
- Added support for Podman when using Red Hat Enterprise Linux 8.4
160160
- Minor bug fixes
161161

0 commit comments

Comments
 (0)