diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs index 298b6b01..2579d379 100644 --- a/Oqtane.Server/Controllers/SettingController.cs +++ b/Oqtane.Server/Controllers/SettingController.cs @@ -64,7 +64,7 @@ namespace Oqtane.Controllers } else { - // suppress unauthorized visitor logging as it is usually caused by clients that do not support cookies + // suppress unauthorized visitor logging as it is usually caused by clients that do not support cookies or private browsing sessions if (entityName != EntityNames.Visitor) { _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityName, entityId); diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 30593b3b..cf7a8e79 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -91,7 +91,7 @@ namespace Oqtane.Infrastructure // get configuration if (install == null) { - // startup or silent installation + // startup or auotmated installation install = new InstallConfig { ConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey), @@ -111,7 +111,7 @@ namespace Oqtane.Infrastructure if (!string.IsNullOrEmpty(install.ConnectionString) && !string.IsNullOrEmpty(install.Aliases) && !string.IsNullOrEmpty(install.HostPassword) && !string.IsNullOrEmpty(install.HostEmail)) { - // silent install + // automated install install.SiteTemplate = GetInstallationConfig(SettingKeys.SiteTemplateKey, Constants.DefaultSiteTemplate); install.DefaultTheme = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme); install.DefaultContainer = GetInstallationConfig(SettingKeys.DefaultContainerKey, Constants.DefaultContainer); @@ -120,7 +120,11 @@ namespace Oqtane.Infrastructure } else { - // silent installation is missing required information + if (!string.IsNullOrEmpty(install.ConnectionString)) + { + // automated installation is missing required information + result.Message = $"Error Installing Master Database For {SettingKeys.ConnectionStringKey}: {install.ConnectionString}. If You Are Trying To Execute An Automated Installation You Must Include The HostEmail, HostPassword, And DefaultAlias In appsettings.json."; + } install.ConnectionString = ""; } } diff --git a/Oqtane.Server/Program.cs b/Oqtane.Server/Program.cs index bd6a9471..24eeee11 100644 --- a/Oqtane.Server/Program.cs +++ b/Oqtane.Server/Program.cs @@ -25,7 +25,10 @@ namespace Oqtane.Server filelogger.LogError($"[Oqtane.Server.Program.Main] {install.Message}"); } } - host.Run(); + else + { + host.Run(); + } } public static IWebHost BuildWebHost(string[] args) =>