From 209f6db0fb24f83de1fd7ef0fd30a3bc3eba8293 Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Fri, 17 Apr 2020 22:22:04 +0200 Subject: [PATCH 1/2] Database creation bug HostUser change is not allowed in silent install --- Oqtane.Server/Infrastructure/DatabaseManager.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index dabe8c78..0e1c475b 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -419,6 +419,7 @@ namespace Oqtane.Infrastructure { using (var db = new InstallationContext(connectionString)) { + //check if DbUp was initialized return TableExists(db, "SchemaVersions"); } @@ -431,6 +432,7 @@ namespace Oqtane.Infrastructure public static bool TableExists(DbContext context, string schema, string tableName) { + if (!context.Database.CanConnect()) return false; var connection = context.Database.GetDbConnection(); if (connection.State.Equals(ConnectionState.Closed)) From 69ceb5dd426170d260e642932adca31ab45db682 Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Fri, 17 Apr 2020 22:29:55 +0200 Subject: [PATCH 2/2] HostUser change is not allowed in silent install --- Oqtane.Server/Infrastructure/DatabaseManager.cs | 4 ++-- Oqtane.Server/appsettings.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 0e1c475b..3485ef63 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -348,10 +348,10 @@ namespace Oqtane.Infrastructure var user = new User { SiteId = site.SiteId, - Username = GetInstallationConfig(SettingKeys.HostUserKey, Constants.HostUser), + Username = Constants.HostUser, Password = password, Email = email, - DisplayName = GetInstallationConfig(SettingKeys.HostUserKey, Constants.HostUser), + DisplayName = Constants.HostUser, }; CreateHostUser(folders, userRoles, roles, users, identityUserManager, user); tenant.IsInitialized = true; diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index a3352489..cad2785c 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -2,9 +2,9 @@ "ConnectionStrings": { "DefaultConnection": "" }, + "Runtime" : "Server", "Installation": { "DefaultAlias": "", - "HostUser": "", "HostPassword": "", "HostEmail": "", "SiteTemplate": "",