diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-09-28 18:08:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-28 18:08:24 -0400 |
| commit | 2d797adc0844bcb054cac3216cb2f9015c754615 (patch) | |
| tree | cdc5678e8c4cf7148a52d1e51982746701c029fd /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | c069496b2740315ca9db406d5eddde2af6aa894c (diff) | |
| parent | 14f563d7c2f7cf87f181bed1d06497adc436f88e (diff) | |
Merge pull request #1773 from sparky8251/remove-wan-ddns
Remove WAN DDNS
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index c9dccb16a..1d0293a5f 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -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 }; } |
