Removed WAN DDNS
It's odd that JF still had code lying around for generating a self signed cert. Currently, it does not do this so this code has been removed. JF also appears to have functions in place to modify provided certs? Warrants deeper investigation. JF should not be attempting modifications of any certs under any circumstance.
This commit is contained in:
parent
208c8b2b9d
commit
14f563d7c2
|
@ -1198,25 +1198,11 @@ namespace Emby.Server.Implementations
|
|||
|
||||
private CertificateInfo GetCertificateInfo(bool generateCertificate)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.CertificatePath))
|
||||
{
|
||||
// Custom cert
|
||||
return new CertificateInfo
|
||||
{
|
||||
Path = ServerConfigurationManager.Configuration.CertificatePath,
|
||||
Password = ServerConfigurationManager.Configuration.CertificatePassword
|
||||
};
|
||||
}
|
||||
|
||||
// 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";
|
||||
|
||||
// Custom cert
|
||||
return new CertificateInfo
|
||||
{
|
||||
Path = certPath,
|
||||
Password = Password
|
||||
Path = ServerConfigurationManager.Configuration.CertificatePath,
|
||||
Password = ServerConfigurationManager.Configuration.CertificatePassword
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -162,7 +162,6 @@ namespace MediaBrowser.Model.Configuration
|
|||
public bool SkipDeserializationForBasicTypes { get; set; }
|
||||
|
||||
public string ServerName { get; set; }
|
||||
public string WanDdns { get; set; }
|
||||
public string BaseUrl { get; set; }
|
||||
|
||||
public string UICulture { get; set; }
|
||||
|
|
Loading…
Reference in New Issue
Block a user