aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-17 14:30:23 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-17 14:30:23 -0500
commita8da86d059c0a9ba724bfcf11166d1b32406ca89 (patch)
treec6f45c97575ece03f36f3a653087fac334aec173 /MediaBrowser.Server.Startup.Common/ApplicationHost.cs
parent5f3c2f68b0a956ce28b8e48bf8fd20c89e44f5d9 (diff)
support api without /mediabrowser
Diffstat (limited to 'MediaBrowser.Server.Startup.Common/ApplicationHost.cs')
-rw-r--r--MediaBrowser.Server.Startup.Common/ApplicationHost.cs20
1 files changed, 4 insertions, 16 deletions
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 29c530438..0d8b65190 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -130,12 +130,12 @@ namespace MediaBrowser.Server.Startup.Common
{
var list = new List<string>
{
- "http://+:" + ServerConfigurationManager.Configuration.HttpServerPortNumber + "/" + WebApplicationName + "/"
+ "http://+:" + ServerConfigurationManager.Configuration.HttpServerPortNumber + "/"
};
if (ServerConfigurationManager.Configuration.UseHttps)
{
- list.Add("https://+:" + ServerConfigurationManager.Configuration.HttpsPortNumber + "/" + WebApplicationName + "/");
+ list.Add("https://+:" + ServerConfigurationManager.Configuration.HttpsPortNumber + "/");
}
return list;
@@ -472,7 +472,7 @@ namespace MediaBrowser.Server.Startup.Common
_supportsNativeWebSocket = false;
}
- HttpServer = ServerFactory.CreateServer(this, LogManager, "Media Browser", WebApplicationName, "dashboard/index.html", false);
+ HttpServer = ServerFactory.CreateServer(this, LogManager, "Media Browser", "web/index.html", false);
RegisterSingleInstance(HttpServer, false);
progress.Report(10);
@@ -810,7 +810,7 @@ namespace MediaBrowser.Server.Startup.Common
{
try
{
- ServerManager.Start(HttpServerUrlPrefixes, CertificatePath);
+ ServerManager.Start(HttpServerUrlPrefixes, ServerConfigurationManager.Configuration.CertificatePath);
}
catch (Exception ex)
{
@@ -977,8 +977,6 @@ namespace MediaBrowser.Server.Startup.Common
CachePath = ApplicationPaths.CachePath,
MacAddress = GetMacAddress(),
HttpServerPortNumber = HttpServerPort,
- UseHttps = UseHttps,
- CertificatePath = CertificatePath,
OperatingSystem = OperatingSystemDisplayName,
CanSelfRestart = CanSelfRestart,
CanSelfUpdate = CanSelfUpdate,
@@ -1053,16 +1051,6 @@ namespace MediaBrowser.Server.Startup.Common
get { return ServerConfigurationManager.Configuration.HttpServerPortNumber; }
}
- public bool UseHttps
- {
- get { return this.ServerConfigurationManager.Configuration.UseHttps; }
- }
-
- public string CertificatePath
- {
- get { return this.ServerConfigurationManager.Configuration.CertificatePath; }
- }
-
public int HttpsServerPort
{
get { return ServerConfigurationManager.Configuration.HttpsPortNumber; }