Skip to content

Commit 1202530

Browse files
Merge pull request #313111 from MicrosoftDocs/main
Auto Publish – main to live - 2026-03-13 05:00 UTC
2 parents ef484be + 48770ef commit 1202530

34 files changed

Lines changed: 675 additions & 562 deletions

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom:
1717

1818
[!INCLUDE [app-service-managed-certificate](./includes/managed-certs/managed-certs-note.md)]
1919

20-
In your application code, you can access both [public key certificates and certificates that contain a private key that you add to Azure App Service.](configure-ssl-certificate.md). Your app code might act as a client and access an external service that requires certificate authentication. It might also need to perform cryptographic tasks. This article shows how to use public or private certificates in your application code.
20+
In your application code, you can access both [public key certificates and certificates that contain a private key that you add to Azure App Service.](configure-ssl-certificate.md). Your app code might act as a client and access an external service that requires certificate authentication. It might also need to perform cryptographic tasks. This article shows how to use publicly or privately signed certificates in your application code.
2121

2222
This approach to using certificates in your code makes use of the Transport Layer Security (TLS) functionality in App Service, which requires your app to be in the Basic tier or higher. If your app is in the Free or Shared tier, you can [include the certificate file in your app repository](#load-a-certificate-from-a-file).
2323

@@ -111,7 +111,7 @@ For languages that don't support or offer insufficient support for the Windows c
111111

112112
## Load a certificate from a file
113113

114-
If you need to load a certificate file that you upload manually, it's better to upload the certificate by using [File Transfer Protocol Secure (FTPS)](deploy-ftp.md) instead of [Git](deploy-local-git.md), for example. Keep sensitive data like a private certificate out of source control.
114+
If you need to load a certificate file that you upload manually, it's better to upload the certificate by using [File Transfer Protocol Secure (FTPS)](deploy-ftp.md) instead of [Git](deploy-local-git.md), for example. Keep sensitive data like certificate private keys out of source control.
115115

116116
ASP.NET and ASP.NET Core on Windows must access the certificate store even if you load a certificate from a file. To load a certificate file in a Windows .NET app, load the current user profile with the following command in <a target="_blank" href="https://shell.azure.com" >Cloud Shell</a>:
117117

@@ -140,7 +140,7 @@ To see how to load a TLS/SSL certificate from a file in Node.js, PHP, Python, or
140140

141141
The `WEBSITE_LOAD_CERTIFICATES` app setting makes the specified certificates accessible to your Windows or Linux custom containers (including built-in Linux containers) as files. The files are found under the following directories:
142142

143-
| Container platform | Public certificates | Private certificates |
143+
| Container platform | Public certificate files (no private key) | Certificate files that include a private key |
144144
| - | - | - |
145145
| Windows container | `C:\appservice\certificates\public` | `C:\appservice\certificates\private` |
146146
| Linux container | `/var/ssl/certs` | `/var/ssl/private` |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The pricing tier of an App Service plan determines what App Service features you
3535
| Category | Tiers | Description |
3636
|:-|:-|:-|
3737
| Shared compute | Free, Shared | Free and Shared, the two base tiers, run an app on the same Azure VM as other App Service apps, including apps of other customers. These tiers allocate CPU quotas to each app that runs on the shared resources. The resources can't scale out. These tiers are intended for only development and testing purposes. |
38-
| Dedicated compute | Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4 | The Basic, Standard, Premium, PremiumV2, PremiumV3, and PremiumV4 tiers run apps on dedicated Azure VMs. Only apps in the same App Service plan share the same compute resources. The higher the tier, the more VM instances that are available to you for scale-out. |
38+
| Dedicated compute | Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4 | The Basic, Standard, Premium, PremiumV2, PremiumV3, and PremiumV4 tiers run apps on dedicated Azure VMs. Only apps in the same App Service plan share the same compute resources (and those resources aren't shared with other customers). The higher the tier, the more VM instances that are available to you for scale-out. |
3939
| Isolated | IsolatedV2 | The IsolatedV2 tier runs dedicated Azure VMs on dedicated Azure virtual networks. This tier provides network isolation on top of compute isolation to your apps. It provides the maximum scale-out capabilities. |
4040

4141
Each tier also provides a specific subset of App Service features. These features include custom domains and TLS/SSL certificates, autoscaling, deployment slots, backups, Azure Traffic Manager integration, and more. The higher the tier, the more features that are available. To find out which features are supported in each pricing tier, see the [App Service plan details](https://azure.microsoft.com/pricing/details/app-service/windows/#pricing).

articles/app-service/provision-resource-bicep.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,17 @@ az group create --name myResourceGroup --location "southcentralus" &&
108108
az deployment group create --resource-group myResourceGroup --template-file <path-to-template>
109109
```
110110

111-
To deploy a different language stack, update `linuxFxVersion` with appropriate values. The following table lists examples. To show current versions, run the following command in Cloud Shell: `az webapp config show --resource-group myResourceGroup --name <app-name> --query linuxFxVersion`.
112-
113-
| Language | Example |
114-
|-------------|------------------------------------------------------|
115-
| .NET | `linuxFxVersion="DOTNETCORE&#124;3.0"` |
116-
| PHP | `linuxFxVersion="PHP&#124;7.4"` |
117-
| Node.js | `linuxFxVersion="NODE&#124;24"` |
118-
| Java | `linuxFxVersion="JAVA&#124;1.8 &#124;TOMCAT&#124;9.0"` |
119-
| Python | `linuxFxVersion="PYTHON&#124;3.14"` |
111+
To deploy a different language stack, update `linuxFxVersion` with appropriate values. The following table lists examples. To show the current version, run the following command in Cloud Shell: `az webapp config show --resource-group myResourceGroup --name <app-name> --query linuxFxVersion`.
112+
113+
| Language | Example |
114+
|--------|---------|
115+
| .NET | `linuxFxVersion="DOTNETCORE|8.0"` |
116+
| PHP | `linuxFxVersion="PHP|8.2"` |
117+
| Node.js | `linuxFxVersion="NODE|20-lts"` |
118+
| Java | `linuxFxVersion="TOMCAT|9.0-jre8"` |
119+
| Python | `linuxFxVersion="PYTHON|3.11"` |
120+
121+
Use the `az webapp list-runtimes --os linux` command to review the current list of supported Linux runtime values.
120122

121123
---
122124

-7.77 KB
Loading
3.68 KB
Loading
-40.1 KB
Loading

0 commit comments

Comments
 (0)