michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added public https port setting

Browse Source
This commit is contained in:
Luke Pulverenti 2015-01-18 23:53:28 -05:00
parent de76156391
commit 87314ec101
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -821,7 +821,7 @@ namespace MediaBrowser.Api.Playback
{ {
get get
{ {
return true; return false;
} }
} }

7
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -20,6 +20,12 @@ namespace MediaBrowser.Model.Configuration
/// <value>The public mapped port.</value> /// <value>The public mapped port.</value>
public int PublicPort { get; set; } public int PublicPort { get; set; }
/// <summary>
/// Gets or sets the public HTTPS port.
/// </summary>
/// <value>The public HTTPS port.</value>
public int PublicHttpsPort { get; set; }
/// <summary> /// <summary>
/// Gets or sets the HTTP server port number. /// Gets or sets the HTTP server port number.
/// </summary> /// </summary>
@ -204,6 +210,7 @@ namespace MediaBrowser.Model.Configuration
{ {
ImageSavingConvention = ImageSavingConvention.Compatible; ImageSavingConvention = ImageSavingConvention.Compatible;
PublicPort = 8096; PublicPort = 8096;
PublicHttpsPort = 8920;
HttpServerPortNumber = 8096; HttpServerPortNumber = 8096;
HttpsPortNumber = 8920; HttpsPortNumber = 8920;
EnableHttps = false; EnableHttps = false;

5
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
View File

@ -81,7 +81,10 @@ namespace MediaBrowser.Server.Implementations.Connect
ip = (_appHost.EnableHttps ? "https://" : "http://") + ip; 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; return null;

1
MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
View File

@ -145,6 +145,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
_createdRules.Add(address); _createdRules.Add(address);
CreatePortMap(device, _appHost.HttpPort, _config.Configuration.PublicPort); CreatePortMap(device, _appHost.HttpPort, _config.Configuration.PublicPort);
CreatePortMap(device, _appHost.HttpsPort, _config.Configuration.PublicHttpsPort);
} }
} }

10
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@ -515,13 +515,15 @@
"NewCollectionNameExample": "Example: Star Wars Collection", "NewCollectionNameExample": "Example: Star Wars Collection",
"OptionSearchForInternetMetadata": "Search the internet for artwork and metadata", "OptionSearchForInternetMetadata": "Search the internet for artwork and metadata",
"ButtonCreate": "Create", "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.", "LabelLocalHttpServerPortNumberHelp": "The tcp port number that Media Browser's http server should bind to.",
"LabelPublicPort": "Public port number:", "LabelPublicHttpPort": "Public http port number:",
"LabelPublicPortHelp": "The public port number that should be mapped to the local port.", "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", "LabelEnableHttps": "Enable https for remote connections",
"LabelEnableHttpsHelp": "If enabled, the server will report an https url as it's external address.", "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.", "LabelHttpsPortHelp": "The tcp port number that Media Browser's https server should bind to.",
"LabelCertificatePath": "SSL Certificate path:", "LabelCertificatePath": "SSL Certificate path:",
"LabelCertificatePathHelp": "The path on the file system to the ssl certificate .pfx file.", "LabelCertificatePathHelp": "The path on the file system to the ssl certificate .pfx file.",