Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1773 from sparky8251/remove-wan-ddns

Browse Source 
Remove WAN DDNS
This commit is contained in:
Joshua M. Boniface 2019-09-28 18:08:24 -04:00 committed by GitHub
commit 2d797adc08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1197,8 +1197,6 @@ namespace Emby.Server.Implementations
protected IHttpListener CreateHttpListener() => new WebSocketSharpListener(Logger); protected IHttpListener CreateHttpListener() => new WebSocketSharpListener(Logger);
private CertificateInfo GetCertificateInfo(bool generateCertificate) private CertificateInfo GetCertificateInfo(bool generateCertificate)
{
if (!string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.CertificatePath))
{ {
// Custom cert // Custom cert
return new CertificateInfo return new CertificateInfo
@ -1208,18 +1206,6 @@ namespace Emby.Server.Implementations
}; };
} }
// Generate self-signed cert
var certHost = GetHostnameFromExternalDns(ServerConfigurationManager.Configuration.WanDdns);
var certPath = Path.Combine(ServerConfigurationManager.ApplicationPaths.ProgramDataPath, "ssl", "cert_" + (certHost + "2").GetMD5().ToString("N", CultureInfo.InvariantCulture) + ".pfx");
const string Password = "embycert";
return new CertificateInfo
{
Path = certPath,
Password = Password
};
}
/// <summary> /// <summary>
/// Called when [configuration updated]. /// Called when [configuration updated].
/// </summary> /// </summary>

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

@ -162,7 +162,6 @@ namespace MediaBrowser.Model.Configuration
public bool SkipDeserializationForBasicTypes { get; set; } public bool SkipDeserializationForBasicTypes { get; set; }
public string ServerName { get; set; } public string ServerName { get; set; }
public string WanDdns { get; set; }
public string BaseUrl { get; set; } public string BaseUrl { get; set; }
public string UICulture { get; set; } public string UICulture { get; set; }