lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add https port to config object

Browse Source
This commit is contained in:
Luke Pulverenti 2015-01-10 21:12:43 -05:00
parent 5ff5df9867
commit 651f2a2aec
7 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,12 @@ namespace MediaBrowser.Model.Configuration
/// <value>The HTTP server port number.</value> /// <value>The HTTP server port number.</value>
public int HttpServerPortNumber { get; set; } public int HttpServerPortNumber { get; set; }
/// <summary>
/// Gets or sets the HTTPS server port number.
/// </summary>
/// <value>The HTTPS server port number.</value>
public int HttpsPortNumber { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether [enable internet providers]. /// Gets or sets a value indicating whether [enable internet providers].
/// </summary> /// </summary>
@ -187,6 +193,7 @@ namespace MediaBrowser.Model.Configuration
ImageSavingConvention = ImageSavingConvention.Compatible; ImageSavingConvention = ImageSavingConvention.Compatible;
PublicPort = 8096; PublicPort = 8096;
HttpServerPortNumber = 8096; HttpServerPortNumber = 8096;
HttpsPortNumber = 8920;
EnableDashboardResponseCaching = true; EnableDashboardResponseCaching = true;
EnableAutomaticRestart = true; EnableAutomaticRestart = true;

2
MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
View File

@ -83,7 +83,7 @@ namespace MediaBrowser.Server.Mono.Native
return list; return list;
} }
public void AuthorizeServer(int udpPort, int httpServerPort, string tempDirectory) public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory)
{ {
} }

1
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -1098,6 +1098,7 @@ namespace MediaBrowser.Server.Startup.Common
NativeApp.AuthorizeServer( NativeApp.AuthorizeServer(
UdpServerEntryPoint.PortNumber, UdpServerEntryPoint.PortNumber,
ServerConfigurationManager.Configuration.HttpServerPortNumber, ServerConfigurationManager.Configuration.HttpServerPortNumber,
ServerConfigurationManager.Configuration.HttpsPortNumber,
ConfigurationManager.CommonApplicationPaths.TempDirectory); ConfigurationManager.CommonApplicationPaths.TempDirectory);
} }
catch (Exception ex) catch (Exception ex)

3
MediaBrowser.Server.Startup.Common/INativeApp.cs
View File

@ -18,8 +18,9 @@ namespace MediaBrowser.Server.Startup.Common
/// </summary> /// </summary>
/// <param name="udpPort">The UDP port.</param> /// <param name="udpPort">The UDP port.</param>
/// <param name="httpServerPort">The HTTP server port.</param> /// <param name="httpServerPort">The HTTP server port.</param>
/// <param name="httpsServerPort">The HTTPS server port.</param>
/// <param name="tempDirectory">The temporary directory.</param> /// <param name="tempDirectory">The temporary directory.</param>
void AuthorizeServer(int udpPort, int httpServerPort, string tempDirectory); void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string tempDirectory);
/// <summary> /// <summary>
/// Gets the environment. /// Gets the environment.

6
MediaBrowser.ServerApplication/Native/RegisterServer.bat
View File

@ -1,5 +1,6 @@
rem %1 = udp server port rem %1 = udp server port
rem %2 = http server port rem %2 = http server port
rem %3 = https server port
if [%1]==[] GOTO DONE if [%1]==[] GOTO DONE
@ -11,6 +12,11 @@ if [%2]==[] GOTO DONE
netsh advfirewall firewall delete rule name="Port %2" protocol=TCP localport=%2 netsh advfirewall firewall delete rule name="Port %2" protocol=TCP localport=%2
netsh advfirewall firewall add rule name="Port %2" dir=in action=allow protocol=TCP localport=%2 netsh advfirewall firewall add rule name="Port %2" dir=in action=allow protocol=TCP localport=%2
if [%3]==[] GOTO DONE
netsh advfirewall firewall delete rule name="Port %3" protocol=TCP localport=%3
netsh advfirewall firewall add rule name="Port %3" dir=in action=allow protocol=TCP localport=%3
:DONE :DONE
Exit Exit

5
MediaBrowser.ServerApplication/Native/ServerAuthorization.cs
View File

@ -15,8 +15,9 @@ namespace MediaBrowser.ServerApplication.Native
/// </summary> /// </summary>
/// <param name="udpPort">The UDP port.</param> /// <param name="udpPort">The UDP port.</param>
/// <param name="httpServerPort">The HTTP server port.</param> /// <param name="httpServerPort">The HTTP server port.</param>
/// <param name="httpsServerPort">The HTTPS server port.</param>
/// <param name="tempDirectory">The temp directory.</param> /// <param name="tempDirectory">The temp directory.</param>
public static void AuthorizeServer(int udpPort, int httpServerPort, string tempDirectory) public static void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string tempDirectory)
{ {
Directory.CreateDirectory(tempDirectory); Directory.CreateDirectory(tempDirectory);
@ -36,7 +37,7 @@ namespace MediaBrowser.ServerApplication.Native
{ {
FileName = tmpFile, FileName = tmpFile,
Arguments = string.Format("{0} {1}", udpPort, httpServerPort), Arguments = string.Format("{0} {1} {2}", udpPort, httpServerPort, httpsServerPort),
CreateNoWindow = true, CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,

4
MediaBrowser.ServerApplication/Native/WindowsApp.cs
View File

@ -21,9 +21,9 @@ namespace MediaBrowser.ServerApplication.Native
return list; return list;
} }
public void AuthorizeServer(int httpServerPort, int udpPort, string tempDirectory) public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory)
{ {
ServerAuthorization.AuthorizeServer(udpPort, httpServerPort, tempDirectory); ServerAuthorization.AuthorizeServer(udpPort, httpServerPort, httpsPort, tempDirectory);
} }
public NativeEnvironment Environment public NativeEnvironment Environment