Merge pull request #2431 from chlupac/InstallFix

Unattended installation fix
oqtane · Sep 30, 2022 · 68ada8f · 68ada8f
2 parents e40bf08 + 45515b2
commit 68ada8f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -51,7 +51,6 @@ public Installation IsInstalled()
 
             if (!string.IsNullOrEmpty(_config.GetConnectionString(SettingKeys.ConnectionStringKey)))
             {
-                result.Success = true;
                 using (var db = GetInstallationContext())
                 {
                     if (db.Database.CanConnect())
@@ -60,6 +59,7 @@ public Installation IsInstalled()
                         {
                             // verify master database contains a Tenant table ( ie. validate schema is properly provisioned )
                             var provisioned = db.Tenant.Any();
+                            result.Success = true;
                         }
                         catch (Exception ex)
                         {
@@ -715,7 +715,7 @@ private Installation MigrateSites()
                         foreach (var upgrade in siteupgrades)
                         {
                             var aliasname = upgrade.Key.Split(' ').First();
-                            // in the future this equality condition could use RegEx to allow for more flexible matching 
+                            // in the future this equality condition could use RegEx to allow for more flexible matching
                             if (string.Equals(alias.Name, aliasname, StringComparison.OrdinalIgnoreCase))
                             {
                                 tenantManager.SetTenant(alias.TenantId);