Skip to content

Commit 2c9f387

Browse files
authored
Merge pull request #206315 from ecfan/patch-5
Peer review feedback for adding and managing TLS/SSL certificates
2 parents 6208c69 + 7e328eb commit 2c9f387

File tree

8 files changed

+370
-336
lines changed

8 files changed

+370
-336
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ If your app already has a certificate for the selected custom domain, go to [Cre
6565
If your app has no certificate for the selected custom domain, then you have two options:
6666

6767
- **Upload PFX Certificate** - Follow the workflow at [Upload a private certificate](configure-ssl-certificate.md#upload-a-private-certificate), then select this option here.
68-
- **Import App Service Certificate** - Follow the workflow at [Import an App Service certificate](configure-ssl-certificate.md#import-an-app-service-certificate), then select this option here.
68+
- **Import App Service Certificate** - Follow the workflow at [Import an App Service certificate](configure-ssl-certificate.md#buy-and-import-app-service-certificate), then select this option here.
6969

7070
> [!NOTE]
7171
> You can also [Create a free certificate](configure-ssl-certificate.md#create-a-free-managed-certificate) or [Import a Key Vault certificate](configure-ssl-certificate.md#import-a-certificate-from-key-vault), but you must do it separately and then return to the **TLS/SSL Binding** dialog.

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

Lines changed: 241 additions & 234 deletions
Large diffs are not rendered by default.

articles/app-service/environment/integrate-with-application-gateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ With a public domain mapped to the application gateway, you don't need to config
7171

7272
### A valid public certificate
7373

74-
For security enhancement, it's recommended to bind TLS/SSL certificate for session encryption. To bind TLS/SSL certificate to the application gateway, a valid public certificate with following information is required. With [App Service Certificates](../configure-ssl-certificate.md#start-certificate-order), you can buy a TLS/SSL certificate and export it in .pfx format.
74+
For security enhancement, it's recommended to bind TLS/SSL certificate for session encryption. To bind TLS/SSL certificate to the application gateway, a valid public certificate with following information is required. With [App Service Certificates](../configure-ssl-certificate.md#start-certificate-purchase), you can buy a TLS/SSL certificate and export it in .pfx format.
7575

7676
| Name | Value | Description|
7777
| ----- | ------------------- |------------|

articles/app-service/overview-manage-costs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ When you create or use App Service resources, you're charged for the following m
3737
Other cost resources for App Service are (see [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/) for details):
3838

3939
- [App Service domains](manage-custom-dns-buy-domain.md) Your subscription is charged for the domain registration on a yearly basis, if you enable automatic renewal.
40-
- [App Service certificates](configure-ssl-certificate.md#import-an-app-service-certificate) One-time charge at the time of purchase. If you have multiple subdomains to secure, you can reduce cost by purchasing one wildcard certificate instead of multiple standard certificates.
40+
- [App Service certificates](configure-ssl-certificate.md#buy-and-import-app-service-certificate) One-time charge at the time of purchase. If you have multiple subdomains to secure, you can reduce cost by purchasing one wildcard certificate instead of multiple standard certificates.
4141
- [IP-based certificate bindings](configure-ssl-bindings.md#create-binding) The binding is configured on a certificate at the app level. Costs are accrued for each binding. For **Standard** tier and above, the first IP-based binding is not charged.
4242

4343
At the end of your billing cycle, the charges for each VM instance. Your bill or invoice shows a section for all App Service costs. There's a separate line item for each meter.
@@ -177,4 +177,4 @@ You can also [export your cost data](../cost-management-billing/costs/tutorial-e
177177

178178
<!-- Insert links to other articles that might help users save and manage costs for you service here.
179179
180-
Create a table of contents entry for the article in the How-to guides section where appropriate. -->
180+
Create a table of contents entry for the article in the How-to guides section where appropriate. -->

articles/app-service/troubleshoot-domain-ssl-certificates.md

Lines changed: 104 additions & 74 deletions
Large diffs are not rendered by default.

articles/azure-resource-manager/management/azure-services-resource-providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The resources providers that are marked with **- registered** are registered by
4646
| Microsoft.Cache | [Azure Cache for Redis](../../azure-cache-for-redis/index.yml) |
4747
| Microsoft.Capacity | core |
4848
| Microsoft.Cdn | [Content Delivery Network](../../cdn/index.yml) |
49-
| Microsoft.CertificateRegistration | [App Service Certificates](../../app-service/configure-ssl-certificate.md#import-an-app-service-certificate) |
49+
| Microsoft.CertificateRegistration | [App Service Certificates](../../app-service/configure-ssl-certificate.md#import-certificate-into-app-service) |
5050
| Microsoft.ChangeAnalysis | [Azure Monitor](../../azure-monitor/index.yml) |
5151
| Microsoft.ClassicCompute | Classic deployment model virtual machine |
5252
| Microsoft.ClassicInfrastructureMigrate | Classic deployment model migration |

articles/key-vault/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ conceptualContent:
169169
- url: ../app-service/app-service-key-vault-references.md
170170
itemType: overview
171171
text: App Services - Reference Key Vault secrets in App Services
172-
- url: ../app-service/configure-ssl-certificate.md#store-in-azure-key-vault
172+
- url: ../app-service/configure-ssl-certificate.md#store-certificate-in-azure-key-vault
173173
itemType: overview
174174
text: App Services - Maintain App Service certificates in Key Vault
175175
- url: ../aks/developer-best-practices-pod-security.md#use-azure-key-vault-with-secrets-store-csi-driver

includes/app-service-ssl-prepare-app.md

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,42 @@ ms.custom: "include file"
1212

1313
## Prepare your web app
1414

15-
To create custom TLS/SSL bindings or enable client certificates for your App Service app, your [App Service plan](https://azure.microsoft.com/pricing/details/app-service/) must be in the **Basic**, **Standard**, **Premium**, or **Isolated** tier. In this step, you make sure that your web app is in the supported pricing tier.
15+
To create custom TLS/SSL bindings or enable client certificates for your App Service app, your [App Service plan](https://azure.microsoft.com/pricing/details/app-service/) must be in the **Basic**, **Standard**, **Premium**, or **Isolated** tier. To make sure that your web app is in the supported pricing tier, follow these steps:
1616

17-
### Sign in to Azure
17+
### Go to your web app
1818

19-
Open the [Azure portal](https://portal.azure.com).
19+
1. In the [Azure portal](https://portal.azure.com) search box, find and select **App Services**.
2020

21-
### Navigate to your web app
21+
![Screenshot of Azure portal, search box, and "App Services" selected.](./media/app-service-ssl-prepare-app/app-services.png)
2222

23-
Search for and select **App Services**.
23+
1. On the **App Services** page, select your web app's name.
2424

25-
![Select App Services](./media/app-service-ssl-prepare-app/app-services.png)
25+
![Screenshot of the App Services page in Azure portal showing a list of all running web apps, with the first app in the list highlighted.](./media/app-service-ssl-prepare-app/select-app.png)
2626

27-
On the **App Services** page, select the name of your web app.
28-
29-
![Screenshot of the App Services page in Azure portal showing a list of all running web apps, with the first app in the list highlighted.](./media/app-service-ssl-prepare-app/select-app.png)
30-
31-
You have landed on the management page of your web app.
27+
You're now on your web app's management page.
3228

3329
### Check the pricing tier
3430

35-
In the left-hand navigation of your web app page, scroll to the **Settings** section and select **Scale up (App Service plan)**.
31+
1. In the left menu for your web app, under the **Settings** section, select **Scale up (App Service plan)**.
3632

37-
![Scale-up menu](./media/app-service-ssl-prepare-app/scale-up-menu.png)
33+
![Screenshot of web app menu, "Settings" section, and "Scale up (App Service plan)" selected.](./media/app-service-ssl-prepare-app/scale-up-menu.png)
3834

39-
Check to make sure that your web app is not in the **F1** or **D1** tier. Your web app's current tier is highlighted by a dark blue box.
35+
1. Make sure that your web app isn't in the **F1** or **D1** tier, which doesn't support custom TLS/SSL.
4036

41-
![Check pricing tier](./media/app-service-ssl-prepare-app/check-pricing-tier.png)
37+
Your web app's current tier is highlighted by a dark blue box.
4238

43-
Custom SSL is not supported in the **F1** or **D1** tier. If you need to scale up, follow the steps in the next section. Otherwise, close the **Scale up** page and skip the [Scale up your App Service plan](#scale-up-your-app-service-plan) section.
39+
![Screenshot of web app pricing tier information.](./media/app-service-ssl-prepare-app/check-pricing-tier.png)
4440

45-
### Scale up your App Service plan
41+
1. If you need to scale up, follow the steps in the next section. Otherwise, close the **Scale up** page, and skip the [Scale up your App Service plan section](#scale-up-your-app-service-plan).
4642

47-
Select any of the non-free tiers (**B1**, **B2**, **B3**, or any tier in the **Production** category). For additional options, click **See additional options**.
43+
### Scale up your App Service plan
4844

49-
Click **Apply**.
45+
1. Select any non-free tier, such as **B1**, **B2**, **B3**, or any other tier in the **Production** category. For more options, select **See additional options**.
5046

51-
![Choose pricing tier](./media/app-service-ssl-prepare-app/choose-pricing-tier.png)
47+
1. When you're done, select **Apply**.
5248

53-
When you see the following notification, the scale operation is complete.
49+
![Screenshot of pricing tier and "Apply" selected.](./media/app-service-ssl-prepare-app/choose-pricing-tier.png)
5450

55-
![Scale up notification](./media/app-service-ssl-prepare-app/scale-notification.png)
51+
When the following message appears, the scale operation has completed.
5652

53+
![Screenshot with confirmation message for scale up operation.](./media/app-service-ssl-prepare-app/scale-notification.png)

0 commit comments

Comments
 (0)