Merge branch 'master' into simplify-https-config

This commit is contained in:
Mark Monteiro
2020-05-10 14:43:57 -04:00
298 changed files with 12554 additions and 2888 deletions

View File

@@ -19,6 +19,11 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
public bool EnableUPnP { get; set; }
/// <summary>
/// Gets or sets a value indicating whether to enable prometheus metrics exporting.
/// </summary>
public bool EnableMetrics { get; set; }
/// <summary>
/// Gets or sets the public mapped port.
/// </summary>
@@ -268,6 +273,7 @@ namespace MediaBrowser.Model.Configuration
PublicHttpsPort = DefaultHttpsPort;
HttpServerPortNumber = DefaultHttpPort;
HttpsPortNumber = DefaultHttpsPort;
EnableMetrics = false;
EnableHttps = false;
EnableDashboardResponseCaching = true;
EnableCaseSensitiveItemIds = true;