From 87314ec101282bfe45c9b3c5b0a09cbd611d4ce8 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 18 Jan 2015 23:53:28 -0500 Subject: [PATCH] added public https port setting --- MediaBrowser.Api/Playback/BaseStreamingService.cs | 2 +- .../Configuration/ServerConfiguration.cs | 7 +++++++ .../Connect/ConnectManager.cs | 5 ++++- .../EntryPoints/ExternalPortForwarding.cs | 1 + .../Localization/Server/server.json | 10 ++++++---- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 6d403c8986..271c20f4eb 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -821,7 +821,7 @@ namespace MediaBrowser.Api.Playback { get { - return true; + return false; } } diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 94bd30d0b4..2ce0394545 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -20,6 +20,12 @@ namespace MediaBrowser.Model.Configuration /// The public mapped port. public int PublicPort { get; set; } + /// + /// Gets or sets the public HTTPS port. + /// + /// The public HTTPS port. + public int PublicHttpsPort { get; set; } + /// /// Gets or sets the HTTP server port number. /// @@ -204,6 +210,7 @@ namespace MediaBrowser.Model.Configuration { ImageSavingConvention = ImageSavingConvention.Compatible; PublicPort = 8096; + PublicHttpsPort = 8920; HttpServerPortNumber = 8096; HttpsPortNumber = 8920; EnableHttps = false; diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index d3a29f4205..1cc3365e59 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -81,7 +81,10 @@ namespace MediaBrowser.Server.Implementations.Connect ip = (_appHost.EnableHttps ? "https://" : "http://") + ip; } - return ip + ":" + _config.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture); + ip += ":"; + ip += _appHost.EnableHttps ? _config.Configuration.PublicHttpsPort.ToString(CultureInfo.InvariantCulture) : _config.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture); + + return ip; } return null; diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs index 4371739b76..5c69db3e10 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs @@ -145,6 +145,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints _createdRules.Add(address); CreatePortMap(device, _appHost.HttpPort, _config.Configuration.PublicPort); + CreatePortMap(device, _appHost.HttpsPort, _config.Configuration.PublicHttpsPort); } } diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 683a5a6392..0151c0f7d1 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -515,13 +515,15 @@ "NewCollectionNameExample": "Example: Star Wars Collection", "OptionSearchForInternetMetadata": "Search the internet for artwork and metadata", "ButtonCreate": "Create", - "LabelLocalHttpServerPortNumber": "Local port number:", + "LabelLocalHttpServerPortNumber": "Local http port number:", "LabelLocalHttpServerPortNumberHelp": "The tcp port number that Media Browser's http server should bind to.", - "LabelPublicPort": "Public port number:", - "LabelPublicPortHelp": "The public port number that should be mapped to the local port.", + "LabelPublicHttpPort": "Public http port number:", + "LabelPublicHttpPortHelp": "The public port number that should be mapped to the local http port.", + "LabelPublicHttpsPort": "Public https port number:", + "LabelPublicHttpsPortHelp": "The public port number that should be mapped to the local https port.", "LabelEnableHttps": "Enable https for remote connections", "LabelEnableHttpsHelp": "If enabled, the server will report an https url as it's external address.", - "LabelHttpsPort": "Local https port:", + "LabelHttpsPort": "Local https port number:", "LabelHttpsPortHelp": "The tcp port number that Media Browser's https server should bind to.", "LabelCertificatePath": "SSL Certificate path:", "LabelCertificatePathHelp": "The path on the file system to the ssl certificate .pfx file.",