Skip to content

Commit 74a351e

Browse files
authored
Merge pull request #205641 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 95ee6d3 + 5ea7e27 commit 74a351e

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

articles/active-directory/fundamentals/road-to-the-cloud-migrate.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ Non-Windows workstations can be integrated with Azure AD to enhance user experie
100100

101101
* macOS
102102

103-
* [Set up enrollment for macOS devices - Microsoft Intune](/mem/intune/enrollment/macos-enroll)
103+
* Register macOS to Azure AD and [enroll/manage them with MDM solution](/mem/intune/enrollment/macos-enroll)
104104

105-
* Deploy [Microsoft Enterprise SSO plug-in for Apple devices - Microsoft identity platform | Azure](../develop/apple-sso-plugin.md)
105+
* Deploy [Microsoft Enterprise SSO plug-in for Apple devices](../develop/apple-sso-plugin.md)
106106

107-
* Linux
107+
* Plan to deploy [Platform SSO for macOS 13](https://techcommunity.microsoft.com/t5/microsoft-endpoint-manager-blog/microsoft-simplifies-endpoint-manager-enrollment-for-apple/ba-p/3570319)
108108

109-
* Consider Linux on Azure VM where possible
109+
* Linux
110110

111-
* [Sign in to a Linux VM with Azure Active Directory credentials - Azure Virtual Machines](../../active-directory/devices/howto-vm-sign-in-azure-ad-linux.md)
111+
* [Sign in to a Linux VM with Azure Active Directory credentials](../../active-directory/devices/howto-vm-sign-in-azure-ad-linux.md) is available on Linux on Azure VM
112112

113113
### Replace Other Windows versions as Workstation use
114114

articles/app-service/configure-ssl-certificate.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,10 @@ If you use Azure Key Vault to manage your certificates, you can import a PKCS12
220220
### Authorize App Service to read from the vault
221221
By default, the App Service resource provider doesn’t have access to the Key Vault. In order to use a Key Vault for a certificate deployment, you need to [authorize the resource provider read access to the KeyVault](../key-vault/general/assign-access-policy-cli.md).
222222

223-
`abfa0a7c-a6b6-4736-8310-5855508787cd` is the resource provider service principal name for App Service, and it's the same for all Azure subscriptions. For Azure Government cloud environment, use `6a02c803-dafd-4136-b4c3-5a6f318b4714` instead as the resource provider service principal name.
223+
| Resource Provider | Service Principal AppId | KeyVault secret permissions | KeyVault certificate permissions |
224+
|--|--|--|--|
225+
| `Microsoft Azure App Service` or `Microsoft.Azure.WebSites` | `abfa0a7c-a6b6-4736-8310-5855508787cd` (It's the same for all Azure subscriptions)<br/><br/>For Azure Government cloud environment, use `6a02c803-dafd-4136-b4c3-5a6f318b4714`. | Get | Get |
226+
| Microsoft.Azure.CertificateRegistration | | Get<br/>List<br/>Set<br/>Delete | Get<br/>List |
224227

225228
> [!NOTE]
226229
> Currently, Key Vault Certificate only supports Key Vault access policy but not RBAC model.

articles/app-service/overview-hosting-plans.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,17 @@ Since you pay for the computing resources your App Service plan allocates (see [
9898

9999
Isolate your app into a new App Service plan when:
100100

101-
- The app is resource-intensive.
101+
- The app is resource-intensive. The number may actually be lower depending on how resource intensive the hosted applications are, however as a general guidance, you may refer to the table below:
102+
103+
| App Service Plan SKU | Max Apps |
104+
|--|--|
105+
| B1, S1, P1v2, I1v1 | 8 |
106+
| B2, S2, P2v2, I2v1 | 16 |
107+
| B3, S3, P3v2, I3v1 | 32 |
108+
| P1v3, I1v2 | 16 |
109+
| P2v3, I2v2 | 32 |
110+
| P3v3, I3v2 | 64 |
111+
102112
- You want to scale the app independently from the other apps in the existing plan.
103113
- The app needs resource in a different geographical region.
104114

@@ -107,4 +117,4 @@ This way you can allocate a new set of resources for your app and gain greater c
107117
## Manage an App Service plan
108118

109119
> [!div class="nextstepaction"]
110-
> [Manage an App Service plan](app-service-plan-manage.md)
120+
> [Manage an App Service plan](app-service-plan-manage.md)

0 commit comments

Comments
 (0)