فهرست منبع

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

Remove WAN DDNS
Joshua M. Boniface 5 سال پیش
والد
کامیت
2d797adc08
2فایلهای تغییر یافته به همراه3 افزوده شده و 18 حذف شده
  1. 3 17
      Emby.Server.Implementations/ApplicationHost.cs
  2. 0 1
      MediaBrowser.Model/Configuration/ServerConfiguration.cs

+ 3 - 17
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
             };
         }
 

+ 0 - 1
MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -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; }