aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Startup.Common
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-23 01:15:15 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-23 01:15:15 -0500
commitdb038464814ea56fd90526dd35ce790cfc2a72e2 (patch)
tree207f17b30e93b063f5f2e2ed538be8dc9c5593b8 /MediaBrowser.Server.Startup.Common
parent6a4a29b8034eb7eb5baa03729692426a7f5b9e7f (diff)
sync updates
Diffstat (limited to 'MediaBrowser.Server.Startup.Common')
-rw-r--r--MediaBrowser.Server.Startup.Common/ApplicationHost.cs42
1 files changed, 21 insertions, 21 deletions
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 7eb68187a..4fc6ae6fa 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -796,35 +796,35 @@ namespace MediaBrowser.Server.Startup.Common
private string GetCertificatePath(bool generateCertificate)
{
- if (string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.CertificatePath))
+ if (!string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.CertificatePath))
{
- // Generate self-signed cert
- var certHost = GetHostnameFromExternalDns(ServerConfigurationManager.Configuration.WanDdns);
- var certPath = Path.Combine(ServerConfigurationManager.ApplicationPaths.ProgramDataPath, "ssl", "cert_" + certHost.GetMD5().ToString("N") + ".pfx");
+ // Custom cert
+ return ServerConfigurationManager.Configuration.CertificatePath;
+ }
+
+ // Generate self-signed cert
+ var certHost = GetHostnameFromExternalDns(ServerConfigurationManager.Configuration.WanDdns);
+ var certPath = Path.Combine(ServerConfigurationManager.ApplicationPaths.ProgramDataPath, "ssl", "cert_" + certHost.GetMD5().ToString("N") + ".pfx");
- if (generateCertificate)
+ if (generateCertificate)
+ {
+ if (!File.Exists(certPath))
{
- if (!File.Exists(certPath))
+ Directory.CreateDirectory(Path.GetDirectoryName(certPath));
+
+ try
{
- Directory.CreateDirectory(Path.GetDirectoryName(certPath));
-
- try
- {
- NetworkManager.GenerateSelfSignedSslCertificate(certPath, certHost);
- }
- catch (Exception ex)
- {
- Logger.ErrorException("Error creating ssl cert", ex);
- return null;
- }
+ NetworkManager.GenerateSelfSignedSslCertificate(certPath, certHost);
+ }
+ catch (Exception ex)
+ {
+ Logger.ErrorException("Error creating ssl cert", ex);
+ return null;
}
}
-
- return certPath;
}
- // Custom cert
- return ServerConfigurationManager.Configuration.CertificatePath;
+ return certPath;
}
/// <summary>