@ -331,6 +331,13 @@ namespace Emby.Server.Implementations
fileSystem . AddShortcutHandler ( new MbLinkShortcutHandler ( fileSystem ) ) ;
fileSystem . AddShortcutHandler ( new MbLinkShortcutHandler ( fileSystem ) ) ;
NetworkManager . NetworkChanged + = OnNetworkChanged ;
NetworkManager . NetworkChanged + = OnNetworkChanged ;
CertificateInfo = new CertificateInfo
{
Path = ServerConfigurationManager . Configuration . CertificatePath ,
Password = ServerConfigurationManager . Configuration . CertificatePassword
} ;
Certificate = GetCertificate ( CertificateInfo ) ;
}
}
public string ExpandVirtualPath ( string path )
public string ExpandVirtualPath ( string path )
@ -712,9 +719,6 @@ namespace Emby.Server.Implementations
serviceCollection . AddSingleton < ISearchEngine > ( new SearchEngine ( LoggerFactory , LibraryManager , UserManager ) ) ;
serviceCollection . AddSingleton < ISearchEngine > ( new SearchEngine ( LoggerFactory , LibraryManager , UserManager ) ) ;
CertificateInfo = GetCertificateInfo ( true ) ;
Certificate = GetCertificate ( CertificateInfo ) ;
serviceCollection . AddSingleton < ServiceController > ( ) ;
serviceCollection . AddSingleton < ServiceController > ( ) ;
serviceCollection . AddSingleton < IHttpListener , WebSocketSharpListener > ( ) ;
serviceCollection . AddSingleton < IHttpListener , WebSocketSharpListener > ( ) ;
serviceCollection . AddSingleton < IHttpServer , HttpListenerHost > ( ) ;
serviceCollection . AddSingleton < IHttpServer , HttpListenerHost > ( ) ;
@ -1106,16 +1110,6 @@ namespace Emby.Server.Implementations
} ) ;
} ) ;
}
}
private CertificateInfo GetCertificateInfo ( bool generateCertificate )
{
// Custom cert
return new CertificateInfo
{
Path = ServerConfigurationManager . Configuration . CertificatePath ,
Password = ServerConfigurationManager . Configuration . CertificatePassword
} ;
}
/// <summary>
/// <summary>
/// Called when [configuration updated].
/// Called when [configuration updated].
/// </summary>
/// </summary>
@ -1148,8 +1142,7 @@ namespace Emby.Server.Implementations
}
}
var currentCertPath = CertificateInfo ? . Path ;
var currentCertPath = CertificateInfo ? . Path ;
var newCertInfo = GetCertificateInfo ( false ) ;
var newCertPath = ServerConfigurationManager . Configuration . CertificatePath ;
var newCertPath = newCertInfo ? . Path ;
if ( ! string . Equals ( currentCertPath , newCertPath , StringComparison . OrdinalIgnoreCase ) )
if ( ! string . Equals ( currentCertPath , newCertPath , StringComparison . OrdinalIgnoreCase ) )
{
{