From bd3438069bb0735f483ecc66f515e1a9d726e897 Mon Sep 17 00:00:00 2001 From: Luke Latham <1622880+guardrex@users.noreply.github.com> Date: Mon, 18 Sep 2017 10:54:05 -0500 Subject: [PATCH] Update IIS options and cross-link IIS+Kestrel options in Hosting topic (#4310) * Update IIS options and cross-link IIS+Kestrel options in Hosting topic * React to feedback --- aspnetcore/fundamentals/hosting.md | 4 ++-- aspnetcore/publishing/iis.md | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/aspnetcore/fundamentals/hosting.md b/aspnetcore/fundamentals/hosting.md index bcd427114ba3..8da9110dc5b6 100644 --- a/aspnetcore/fundamentals/hosting.md +++ b/aspnetcore/fundamentals/hosting.md @@ -29,7 +29,7 @@ Create a host using an instance of [WebHostBuilder](/dotnet/api/microsoft.aspnet `CreateDefaultBuilder` performs the following tasks: -* Configures [Kestrel](servers/kestrel.md) as the web server. +* Configures [Kestrel](servers/kestrel.md) as the web server. For the Kestrel default options, see [the Kestrel options section of Kestrel web server implementation in ASP.NET Core](xref:fundamentals/servers/kestrel#kestrel-options). * Sets the content root to [Directory.GetCurrentDirectory](/dotnet/api/system.io.directory.getcurrentdirectory). * Loads optional configuration from: * *appsettings.json*. @@ -38,7 +38,7 @@ Create a host using an instance of [WebHostBuilder](/dotnet/api/microsoft.aspnet * Environment variables. * Command-line arguments. * Configures [logging](xref:fundamentals/logging) for console and debug output with [log filtering](xref:fundamentals/logging#log-filtering) rules specified in a Logging configuration section of an *appsettings.json* or *appsettings.{Environment}.json* file. -* When running behind IIS, enables IIS integration by configuring the base path and port the server should listen on when using the [ASP.NET Core Module](xref:fundamentals/servers/aspnet-core-module). The module creates a reverse-proxy between Kestrel and IIS. Also configures the app to [capture startup errors](#capture-startup-errors). +* When running behind IIS, enables [IIS integration](xref:publishing/iis) by configuring the base path and port the server should listen on when using the [ASP.NET Core Module](xref:fundamentals/servers/aspnet-core-module). The module creates a reverse-proxy between IIS and Kestrel. Also configures the app to [capture startup errors](#capture-startup-errors). For the IIS default options, see [the IIS options section of Host ASP.NET Core on Windows with IIS](xref:publishing/iis#iis-options). The *content root* determines where the host searches for content files, such as MVC view files. The default content root is [Directory.GetCurrentDirectory](/dotnet/api/system.io.directory.getcurrentdirectory). This results in using the web project's root folder as the content root when the app is started from the root folder (for example, calling [dotnet run](/dotnet/core/tools/dotnet-run) from the project folder). This is the default used in [Visual Studio](https://www.visualstudio.com/) and the [dotnet new templates](/dotnet/core/tools/dotnet-new). diff --git a/aspnetcore/publishing/iis.md b/aspnetcore/publishing/iis.md index a08dffa212b0..7ef8be7032f4 100644 --- a/aspnetcore/publishing/iis.md +++ b/aspnetcore/publishing/iis.md @@ -94,21 +94,22 @@ Both `UseKestrel` and `UseIISIntegration` are required. Code calling *UseIISInte For more information on hosting, see [Hosting in ASP.NET Core](xref:fundamentals/hosting). -### Setting IISOptions for the IISIntegration service +### IIS options -To configure *IISIntegration* service options, include a service configuration for *IISOptions* in *ConfigureServices*. +To configure *IISIntegration* service options, include a service configuration for *IISOptions* in *ConfigureServices*: ```csharp -services.Configure(options => { - ... +services.Configure(options => +{ + ... }); ``` -| Option | Setting| -| --- | --- | -| AutomaticAuthentication | If true, the authentication middleware will alter the request user arriving and respond to generic challenges. If false,the authentication middleware will only provide identity and respond to challenges when explicitly indicated by theAuthenticationScheme | -| ForwardClientCertificate | If true and the `MS-ASPNETCORE-CLIENTCERT` request header is present, the `ITLSConnectionFeature` will be populated. | -| ForwardWindowsAuthentication | If true, authentication middleware will attempt to authenticate using platform handler windows authentication. If false, authentication middleware won’t be added. | +| Option | Default | Setting | +| ------------------------------ | ------- | ------- | +| `AutomaticAuthentication` | `true` | If `true`, the authentication middleware sets the `HttpContext.User` and responds to generic challenges. If `false`, the authentication middleware only provides an identity (`HttpContext.User`) and responds to challenges when explicitly requested by the `AuthenticationScheme`. Windows Authentication must be enabled in IIS for `AutomaticAuthentication` to function. | +| `AuthenticationDisplayName` | `null` | Sets the display name shown to users on login pages. | +| `ForwardClientCertificate` | `true` | If `true` and the `MS-ASPNETCORE-CLIENTCERT` request header is present, the `HttpContext.Connection.ClientCertificate` is populated. | ### web.config