Skip to content

Commit d31efc2

Browse files
authored
Merge pull request #286725 from MicrosoftDocs/main
9/13/2024 PM Publish
2 parents 6074e3a + cd6cd4c commit d31efc2

File tree

107 files changed

+1168
-4932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1168
-4932
lines changed

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4749,6 +4749,26 @@
47494749
"source_path_from_root": "/articles/modeling-simulation-workbench/how-to-guide-manage-storage.md",
47504750
"redirect_url": "/azure/modeling-simulation-workbench/concept-storage",
47514751
"redirect_document_id": false
4752+
},
4753+
{
4754+
"source_path_from_root": "/articles/load-balancer/upgrade-basic-standard.md",
4755+
"redirect_url": "/azure/load-balancer/upgrade-basic-standard-with-powershell",
4756+
"redirect_document_id": false
4757+
},
4758+
{
4759+
"source_path_from_root": "/articles/load-balancer/upgrade-basicinternal-standard.md",
4760+
"redirect_url": "/azure/load-balancer/upgrade-basic-standard-with-powershell",
4761+
"redirect_document_id": false
4762+
},
4763+
{
4764+
"source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-overview.md",
4765+
"redirect_url": "/azure/virtual-network/ip-services/ipv6-overview",
4766+
"redirect_document_id": false
4767+
},
4768+
{
4769+
"source_path_from_root": "/articles/azure-glossary-cloud-terminology.md",
4770+
"redirect_url": "/azure/cloud-adoption-framework/ready/considerations/fundamental-concepts",
4771+
"redirect_document_id": false
47524772
}
47534773
]
47544774
}

articles/app-service/configure-language-nodejs.md

Lines changed: 32 additions & 35 deletions
Large diffs are not rendered by default.

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

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,33 @@ If you use Azure Key Vault to manage your certificates, you can import a PKCS12
134134

135135
### Authorize App Service to read from the vault
136136

137-
By default, the App Service resource provider doesn't have access to your key vault. To use a key vault for a certificate deployment, you must [authorize read access for the resource provider to the key vault](/azure/key-vault/general/assign-access-policy-cli).
137+
By default, the App Service resource provider doesn't have access to your key vault. To use a key vault for a certificate deployment, you must authorize read access for the resource provider (App Service) to the key vault. You can grant access either with access policy or RBAC.
138138

139139
> [!NOTE]
140-
> Currently, the Azure portal does not allow you to configure an App Service certificate in Key Vault to use the RBAC model. You can, however, use Azure CLI, Azure PowerShell, or an ARM template deployment to perform this configuration. For more information, see [Provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control](/azure/key-vault/general/rbac-guide?tabs=azure-cli).
140+
> Currently, the Azure portal does not allow you to configure an App Service certificate in Key Vault to use the RBAC model. You can, however, use Azure CLI, Azure PowerShell, or an ARM template deployment to perform this configuration.
141141
142-
| Resource provider | Service principal AppId | Key vault secret permissions | Key vault certificate permissions | Key vault RBAC permissions |
143-
|--|--|--|--|--|
144-
| **Microsoft Azure App Service** or **Microsoft.Azure.WebSites** | - `abfa0a7c-a6b6-4736-8310-5855508787cd`, which is the same for all Azure subscriptions <br><br>- For Azure Government cloud environment, use `6a02c803-dafd-4136-b4c3-5a6f318b4714`. | Get | Get | Certificate User |
145-
| **Microsoft.Azure.CertificateRegistration** | | Get<br/>List<br/>Set<br/>Delete | Get<br/>List | |
142+
### [RBAC permissions](#tab/RBAC)
143+
| Resource provider | Service principal app ID / assignee | Key vault RBAC role |
144+
|--|--|--|
145+
| **Microsoft Azure App Service** or **Microsoft.Azure.WebSites** | - `abfa0a7c-a6b6-4736-8310-5855508787cd` for public Azure cloud environment <br><br>- `6a02c803-dafd-4136-b4c3-5a6f318b4714` for Azure Government cloud environment | Certificate User |
146+
147+
The service principal app ID or assignee value is the ID for App Service resource provider. To learn how to authorize key vault permissions for App Service resource provider using access policy refer to the [provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control documentation](/azure/key-vault/general/rbac-guide?tabs=azure-portal#key-vault-scope-role-assignment).
148+
149+
> [!NOTE]
150+
> Do not delete these RBAC permissions from key vault, otherwise App Service will not be able to sync your web app with the latest key vault certificate version.
151+
152+
### [Access policy permissions](#tab/accesspolicy)
153+
154+
| Resource provider | Service principal app ID | Key vault secret permissions | Key vault certificate permissions |
155+
|--|--|--|--|
156+
| **Microsoft Azure App Service** or **Microsoft.Azure.WebSites** | - `abfa0a7c-a6b6-4736-8310-5855508787cd` for public Azure cloud environment <br><br>- `6a02c803-dafd-4136-b4c3-5a6f318b4714` for Azure Government cloud environment | Get | Get |
157+
158+
The service principal app ID or assignee value is the ID for App Service resource provider. To learn how to authorize key vault permissions for App Service resource provider using access policy refer to the [assign a Key Vault access policy documentation](/azure/key-vault/general/assign-access-policy?tabs=azure-portal).
159+
160+
> [!NOTE]
161+
> Do not delete these access policy permissions from key vault, otherwise App Service will not be able to sync your web app with the latest key vault certificate version.
162+
163+
---
146164

147165
### Import a certificate from your vault to your app
148166

0 commit comments

Comments
 (0)