starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add certificate to https and minor cleanup

Browse Source
This commit is contained in:
Claus Vium
2019-03-03 08:29:23 +01:00
parent 6bdb5debd2
commit e823c11b46
5 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -626,9 +626,12 @@ namespace Emby.Server.Implementations
{
options.Listen(IPAddress.Any, HttpPort);
options.Listen(IPAddress.Loopback, HttpPort);
// TODO certs
options.Listen(IPAddress.Any, HttpsPort, listenOptions => { listenOptions.UseHttps(); });
options.Listen(IPAddress.Loopback, HttpsPort, listenOptions => { listenOptions.UseHttps(); });
if (CertificateInfo != null)
{
options.Listen(IPAddress.Any, HttpsPort, listenOptions => { listenOptions.UseHttps(Certificate); });
options.Listen(IPAddress.Loopback, HttpsPort, listenOptions => { listenOptions.UseHttps(Certificate); });
}
})
.UseContentRoot(Path.Combine(Directory.GetCurrentDirectory(), "jellyfin-web", "src"))
.ConfigureServices(services =>
@@ -927,11 +930,9 @@ namespace Emby.Server.Implementations
}
}
protected virtual bool SupportsDualModeSockets => true;
private X509Certificate GetCertificate(CertificateInfo info)
private X509Certificate2 GetCertificate(CertificateInfo info)
{
var certificateLocation = info == null ? null : info.Path;
var certificateLocation = info?.Path;
if (string.IsNullOrWhiteSpace(certificateLocation))
{
@@ -1004,7 +1005,7 @@ namespace Emby.Server.Implementations
return info;
}
protected virtual FFMpegInfo GetFFMpegInfo()
protected FFMpegInfo GetFFMpegInfo()
{
return new FFMpegLoader(ApplicationPaths, FileSystemManager, GetFfmpegInstallInfo())
.GetFFMpegInfo(StartupOptions);
@@ -1085,7 +1086,7 @@ namespace Emby.Server.Implementations
/// </summary>
private void SetStaticProperties()
{
((SqliteItemRepository)ItemRepository).ImageProcessor = ImageProcessor;
ItemRepository.ImageProcessor = ImageProcessor;
// For now there's no real way to inject these properly
BaseItem.Logger = LoggerFactory.CreateLogger("BaseItem");
@@ -1211,15 +1212,12 @@ namespace Emby.Server.Implementations
AllConcreteTypes = GetComposablePartAssemblies()
.SelectMany(x => x.ExportedTypes)
.Where(type =>
{
return type.IsClass && !type.IsAbstract && !type.IsInterface && !type.IsGenericType;
})
.Where(type => type.IsClass && !type.IsAbstract && !type.IsInterface && !type.IsGenericType)
.ToArray();
}
private CertificateInfo CertificateInfo { get; set; }
protected X509Certificate Certificate { get; private set; }
protected X509Certificate2 Certificate { get; private set; }
private IEnumerable<string> GetUrlPrefixes()
{