diff --git a/README.md b/README.md
index a03c2d0a2d..10e2440f64 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,8 @@ If using MySQL, our provider library [recommends you set 'utf8mb4' as your defau
The user created for the application will need the privilege to create databases on the first run. Once the initial set of migrations is run, the create right may be revoked. The user should maintain DDL rights though for applying future migrations
+Note that the ratio of application installations to databases is 1:1. Do not attempt to share a database amongst multiple TGS installations.
+
### Starting
For the Windows service version start the `tgstation-server-4` service
diff --git a/src/Tgstation.Server.Api/Models/Internal/CompileJob.cs b/src/Tgstation.Server.Api/Models/Internal/CompileJob.cs
index e101ff7f23..c659c49737 100644
--- a/src/Tgstation.Server.Api/Models/Internal/CompileJob.cs
+++ b/src/Tgstation.Server.Api/Models/Internal/CompileJob.cs
@@ -16,16 +16,19 @@ namespace Tgstation.Server.Api.Models.Internal
///
/// The .dme file used for compilation
///
+ [Required]
public string DmeName { get; set; }
///
/// Textual output of DM
///
+ [Required]
public string Output { get; set; }
///
/// The Game folder the results were compiled into
///
+ [Required]
public Guid? DirectoryName { get; set; }
///
diff --git a/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs b/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs
index cb147a5e79..48843b419d 100644
--- a/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs
+++ b/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs
@@ -51,7 +51,7 @@ namespace Tgstation.Server.Host.Controllers
{
var instance = instanceManager.GetInstance(Instance);
var dreamMakerSettings = await DatabaseContext.DreamMakerSettings.Where(x => x.InstanceId == Instance.Id).FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
- return Json(new Api.Models.DreamMaker
+ return Json(new DreamMaker
{
ProjectName = dreamMakerSettings.ProjectName,
ApiValidationPort = dreamMakerSettings.ApiValidationPort
diff --git a/src/Tgstation.Server.Host/Models/CompileJob.cs b/src/Tgstation.Server.Host/Models/CompileJob.cs
index 22e97759dd..3fadc5b182 100644
--- a/src/Tgstation.Server.Host/Models/CompileJob.cs
+++ b/src/Tgstation.Server.Host/Models/CompileJob.cs
@@ -9,8 +9,14 @@ namespace Tgstation.Server.Host.Models
///
/// See
///
+ [Required]
public Job Job { get; set; }
+ ///
+ /// The of
+ ///
+ public long JobId { get; set; }
+
///
/// See
///
@@ -35,7 +41,8 @@ namespace Tgstation.Server.Host.Models
Job = Job.ToApi(),
Output = Output,
RevisionInformation = RevisionInformation.ToApi(),
- ByondVersion = Version.Parse(ByondVersion)
+ ByondVersion = Version.Parse(ByondVersion),
+ MinimumSecurityLevel = MinimumSecurityLevel
};
}
}
diff --git a/src/Tgstation.Server.Host/Models/DatabaseContext.cs b/src/Tgstation.Server.Host/Models/DatabaseContext.cs
index c79f697839..7578c21c8a 100644
--- a/src/Tgstation.Server.Host/Models/DatabaseContext.cs
+++ b/src/Tgstation.Server.Host/Models/DatabaseContext.cs
@@ -107,11 +107,13 @@ namespace Tgstation.Server.Host.Models
var revInfo = modelBuilder.Entity();
revInfo.HasMany(x => x.CompileJobs).WithOne(x => x.RevisionInformation).OnDelete(DeleteBehavior.Cascade);
revInfo.HasMany(x => x.ActiveTestMerges).WithOne(x => x.RevisionInformation).OnDelete(DeleteBehavior.Cascade);
- revInfo.HasOne(x => x.PrimaryTestMerge).WithOne(x => x.PrimaryRevisionInformation).OnDelete(DeleteBehavior.SetNull);
+ revInfo.HasOne(x => x.PrimaryTestMerge).WithOne(x => x.PrimaryRevisionInformation).OnDelete(DeleteBehavior.Restrict);
revInfo.HasIndex(x => x.CommitSha).IsUnique();
modelBuilder.Entity().HasIndex(x => x.DirectoryName);
+ modelBuilder.Entity().HasOne().WithOne(x => x.Job).OnDelete(DeleteBehavior.Restrict);
+
var chatChannel = modelBuilder.Entity();
chatChannel.HasIndex(x => new { x.ChatSettingsId, x.IrcChannel }).IsUnique();
chatChannel.HasIndex(x => new { x.ChatSettingsId, x.DiscordChannelId }).IsUnique();
@@ -128,6 +130,7 @@ namespace Tgstation.Server.Host.Models
instanceModel.HasMany(x => x.RevisionInformations).WithOne(x => x.Instance).OnDelete(DeleteBehavior.Cascade);
instanceModel.HasMany(x => x.InstanceUsers).WithOne(x => x.Instance).OnDelete(DeleteBehavior.Cascade);
instanceModel.HasMany(x => x.Jobs).WithOne(x => x.Instance).OnDelete(DeleteBehavior.Cascade);
+ instanceModel.HasOne(x => x.WatchdogReattachInformation).WithOne().OnDelete(DeleteBehavior.Cascade);
}
///
diff --git a/src/Tgstation.Server.Host/Models/Migrations/20180918020726_MYAddMinimumSecurity.Designer.cs b/src/Tgstation.Server.Host/Models/Migrations/20180918020726_MYAddMinimumSecurity.Designer.cs
index bf112bf7b2..0c4538790b 100644
--- a/src/Tgstation.Server.Host/Models/Migrations/20180918020726_MYAddMinimumSecurity.Designer.cs
+++ b/src/Tgstation.Server.Host/Models/Migrations/20180918020726_MYAddMinimumSecurity.Designer.cs
@@ -3,646 +3,645 @@ using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
-using Tgstation.Server.Host.Models;
-namespace Tgstation.Server.Host.Migrations
+namespace Tgstation.Server.Host.Models.Migrations
{
- [DbContext(typeof(MySqlDatabaseContext))]
- [Migration("20180918020726_MYAddMinimumSecurity")]
- partial class MYAddMinimumSecurity
+ [DbContext(typeof(MySqlDatabaseContext))]
+ [Migration("20180918020726_MYAddMinimumSecurity")]
+ partial class MYAddMinimumSecurity
{
///
/// Builds the target model
///
/// The to use
protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
+ {
#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "2.1.3-rtm-32065")
- .HasAnnotation("Relational:MaxIdentifierLength", 64);
+ modelBuilder
+ .HasAnnotation("ProductVersion", "2.1.3-rtm-32065")
+ .HasAnnotation("Relational:MaxIdentifierLength", 64);
- modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("ConnectionString")
- .IsRequired();
+ b.Property("ConnectionString")
+ .IsRequired();
- b.Property("Enabled");
+ b.Property("Enabled");
- b.Property("InstanceId");
+ b.Property("InstanceId");
- b.Property("Name")
- .IsRequired();
+ b.Property("Name")
+ .IsRequired();
- b.Property("Provider");
+ b.Property("Provider");
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("InstanceId");
+ b.HasIndex("InstanceId");
- b.HasIndex("Name")
- .IsUnique();
+ b.HasIndex("Name")
+ .IsUnique();
- b.ToTable("ChatBots");
- });
+ b.ToTable("ChatBots");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.ChatChannel", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.ChatChannel", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("ChatSettingsId");
+ b.Property("ChatSettingsId");
- b.Property("DiscordChannelId");
+ b.Property("DiscordChannelId");
- b.Property("IrcChannel");
+ b.Property("IrcChannel");
- b.Property("IsAdminChannel")
- .IsRequired();
+ b.Property("IsAdminChannel")
+ .IsRequired();
- b.Property("IsUpdatesChannel")
- .IsRequired();
+ b.Property("IsUpdatesChannel")
+ .IsRequired();
- b.Property("IsWatchdogChannel")
- .IsRequired();
+ b.Property("IsWatchdogChannel")
+ .IsRequired();
- b.Property("Tag");
+ b.Property("Tag");
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("ChatSettingsId", "DiscordChannelId")
- .IsUnique();
+ b.HasIndex("ChatSettingsId", "DiscordChannelId")
+ .IsUnique();
- b.HasIndex("ChatSettingsId", "IrcChannel")
- .IsUnique();
+ b.HasIndex("ChatSettingsId", "IrcChannel")
+ .IsUnique();
- b.ToTable("ChatChannels");
- });
+ b.ToTable("ChatChannels");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.CompileJob", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.CompileJob", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("ByondVersion")
- .IsRequired();
+ b.Property("ByondVersion")
+ .IsRequired();
- b.Property("DirectoryName");
+ b.Property("DirectoryName");
- b.Property("DmeName");
+ b.Property("DmeName");
- b.Property("JobId");
+ b.Property("JobId");
- b.Property("MinimumSecurityLevel");
+ b.Property("MinimumSecurityLevel");
- b.Property("Output");
+ b.Property("Output");
- b.Property("RevisionInformationId");
+ b.Property("RevisionInformationId");
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("DirectoryName");
+ b.HasIndex("DirectoryName");
- b.HasIndex("JobId");
+ b.HasIndex("JobId");
- b.HasIndex("RevisionInformationId");
+ b.HasIndex("RevisionInformationId");
- b.ToTable("CompileJobs");
- });
+ b.ToTable("CompileJobs");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.DreamDaemonSettings", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.DreamDaemonSettings", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("AccessToken");
+ b.Property("AccessToken");
- b.Property("AllowWebClient")
- .IsRequired();
+ b.Property("AllowWebClient")
+ .IsRequired();
- b.Property("AutoStart")
- .IsRequired();
+ b.Property("AutoStart")
+ .IsRequired();
- b.Property("InstanceId");
+ b.Property("InstanceId");
- b.Property("PrimaryPort")
- .IsRequired();
+ b.Property("PrimaryPort")
+ .IsRequired();
- b.Property("ProcessId");
+ b.Property("ProcessId");
- b.Property("SecondaryPort")
- .IsRequired();
+ b.Property("SecondaryPort")
+ .IsRequired();
- b.Property("SecurityLevel");
+ b.Property("SecurityLevel");
- b.Property("SoftRestart")
- .IsRequired();
+ b.Property("SoftRestart")
+ .IsRequired();
- b.Property("SoftShutdown")
- .IsRequired();
+ b.Property("SoftShutdown")
+ .IsRequired();
- b.Property("StartupTimeout")
- .IsRequired();
+ b.Property("StartupTimeout")
+ .IsRequired();
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("InstanceId")
- .IsUnique();
+ b.HasIndex("InstanceId")
+ .IsUnique();
- b.ToTable("DreamDaemonSettings");
- });
+ b.ToTable("DreamDaemonSettings");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.DreamMakerSettings", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.DreamMakerSettings", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("ApiValidationPort")
- .IsRequired();
+ b.Property("ApiValidationPort")
+ .IsRequired();
- b.Property("ApiValidationSecurityLevel");
+ b.Property("ApiValidationSecurityLevel");
- b.Property("InstanceId");
+ b.Property("InstanceId");
- b.Property("ProjectName");
+ b.Property("ProjectName");
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("InstanceId")
- .IsUnique();
+ b.HasIndex("InstanceId")
+ .IsUnique();
- b.ToTable("DreamMakerSettings");
- });
+ b.ToTable("DreamMakerSettings");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.Instance", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.Instance", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("AutoUpdateInterval")
- .IsRequired();
+ b.Property("AutoUpdateInterval")
+ .IsRequired();
- b.Property("ConfigurationType");
+ b.Property("ConfigurationType");
- b.Property("Name")
- .IsRequired();
+ b.Property("Name")
+ .IsRequired();
- b.Property("Online")
- .IsRequired();
+ b.Property("Online")
+ .IsRequired();
- b.Property("Path")
- .IsRequired();
+ b.Property("Path")
+ .IsRequired();
- b.Property("WatchdogReattachInformationId");
+ b.Property("WatchdogReattachInformationId");
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("Path")
- .IsUnique();
+ b.HasIndex("Path")
+ .IsUnique();
- b.HasIndex("WatchdogReattachInformationId");
+ b.HasIndex("WatchdogReattachInformationId");
- b.ToTable("Instances");
- });
+ b.ToTable("Instances");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.InstanceUser", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.InstanceUser", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("ByondRights");
+ b.Property("ByondRights");
- b.Property("ChatBotRights");
+ b.Property("ChatBotRights");
- b.Property("ConfigurationRights");
+ b.Property("ConfigurationRights");
- b.Property("DreamDaemonRights");
+ b.Property("DreamDaemonRights");
- b.Property("DreamMakerRights");
+ b.Property("DreamMakerRights");
- b.Property("InstanceId");
+ b.Property("InstanceId");
- b.Property("InstanceUserRights");
+ b.Property("InstanceUserRights");
- b.Property("RepositoryRights");
+ b.Property("RepositoryRights");
- b.Property("UserId")
- .IsRequired();
+ b.Property("UserId")
+ .IsRequired();
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("InstanceId");
+ b.HasIndex("InstanceId");
- b.HasIndex("UserId", "InstanceId")
- .IsUnique();
+ b.HasIndex("UserId", "InstanceId")
+ .IsUnique();
- b.ToTable("InstanceUsers");
- });
+ b.ToTable("InstanceUsers");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.Job", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.Job", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("CancelRight");
+ b.Property("CancelRight");
- b.Property("CancelRightsType");
+ b.Property("CancelRightsType");
- b.Property("Cancelled")
- .IsRequired();
+ b.Property("Cancelled")
+ .IsRequired();
- b.Property("CancelledById");
+ b.Property("CancelledById");
- b.Property("Description")
- .IsRequired();
+ b.Property("Description")
+ .IsRequired();
- b.Property("ExceptionDetails");
+ b.Property("ExceptionDetails");
- b.Property("InstanceId");
+ b.Property("InstanceId");
- b.Property("StartedAt")
- .IsRequired();
+ b.Property("StartedAt")
+ .IsRequired();
- b.Property("StartedById");
+ b.Property("StartedById");
- b.Property("StoppedAt");
+ b.Property("StoppedAt");
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("CancelledById");
+ b.HasIndex("CancelledById");
- b.HasIndex("InstanceId");
+ b.HasIndex("InstanceId");
- b.HasIndex("StartedById");
+ b.HasIndex("StartedById");
- b.ToTable("Jobs");
- });
+ b.ToTable("Jobs");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.ReattachInformation", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.ReattachInformation", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("AccessIdentifier")
- .IsRequired();
+ b.Property("AccessIdentifier")
+ .IsRequired();
- b.Property("ChatChannelsJson")
- .IsRequired();
+ b.Property("ChatChannelsJson")
+ .IsRequired();
- b.Property("ChatCommandsJson")
- .IsRequired();
+ b.Property("ChatCommandsJson")
+ .IsRequired();
- b.Property("CompileJobId");
+ b.Property("CompileJobId");
- b.Property("IsPrimary");
+ b.Property("IsPrimary");
- b.Property("Port");
+ b.Property("Port");
- b.Property("ProcessId");
+ b.Property("ProcessId");
- b.Property("RebootState");
+ b.Property("RebootState");
- b.Property("ServerCommandsJson")
- .IsRequired();
+ b.Property("ServerCommandsJson")
+ .IsRequired();
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("CompileJobId");
+ b.HasIndex("CompileJobId");
- b.ToTable("ReattachInformations");
- });
+ b.ToTable("ReattachInformations");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.RepositorySettings", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.RepositorySettings", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("AccessToken");
+ b.Property("AccessToken");
- b.Property("AccessUser");
+ b.Property("AccessUser");
- b.Property("AutoUpdatesKeepTestMerges")
- .IsRequired();
+ b.Property("AutoUpdatesKeepTestMerges")
+ .IsRequired();
- b.Property("AutoUpdatesSynchronize")
- .IsRequired();
+ b.Property("AutoUpdatesSynchronize")
+ .IsRequired();
- b.Property("CommitterEmail")
- .IsRequired();
+ b.Property("CommitterEmail")
+ .IsRequired();
- b.Property("CommitterName")
- .IsRequired();
+ b.Property("CommitterName")
+ .IsRequired();
- b.Property("InstanceId");
+ b.Property("InstanceId");
- b.Property("PushTestMergeCommits")
- .IsRequired();
+ b.Property("PushTestMergeCommits")
+ .IsRequired();
- b.Property("ShowTestMergeCommitters")
- .IsRequired();
+ b.Property("ShowTestMergeCommitters")
+ .IsRequired();
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("InstanceId")
- .IsUnique();
+ b.HasIndex("InstanceId")
+ .IsUnique();
- b.ToTable("RepositorySettings");
- });
+ b.ToTable("RepositorySettings");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.RevInfoTestMerge", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.RevInfoTestMerge", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("RevisionInformationId");
+ b.Property("RevisionInformationId");
- b.Property("TestMergeId");
+ b.Property("TestMergeId");
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("RevisionInformationId");
+ b.HasIndex("RevisionInformationId");
- b.HasIndex("TestMergeId");
+ b.HasIndex("TestMergeId");
- b.ToTable("RevInfoTestMerges");
- });
+ b.ToTable("RevInfoTestMerges");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.RevisionInformation", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.RevisionInformation", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("CommitSha")
- .IsRequired()
- .HasMaxLength(40);
+ b.Property("CommitSha")
+ .IsRequired()
+ .HasMaxLength(40);
- b.Property("InstanceId");
+ b.Property("InstanceId");
- b.Property("OriginCommitSha")
- .IsRequired()
- .HasMaxLength(40);
+ b.Property("OriginCommitSha")
+ .IsRequired()
+ .HasMaxLength(40);
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("CommitSha")
- .IsUnique();
+ b.HasIndex("CommitSha")
+ .IsUnique();
- b.HasIndex("InstanceId");
+ b.HasIndex("InstanceId");
- b.ToTable("RevisionInformations");
- });
+ b.ToTable("RevisionInformations");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.TestMerge", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.TestMerge", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("Author")
- .IsRequired();
+ b.Property("Author")
+ .IsRequired();
- b.Property("BodyAtMerge")
- .IsRequired();
+ b.Property("BodyAtMerge")
+ .IsRequired();
- b.Property("Comment");
+ b.Property("Comment");
- b.Property("MergedAt");
+ b.Property("MergedAt");
- b.Property("MergedById");
+ b.Property("MergedById");
- b.Property("Number")
- .IsRequired();
+ b.Property("Number")
+ .IsRequired();
- b.Property("PrimaryRevisionInformationId");
+ b.Property("PrimaryRevisionInformationId");
- b.Property("PullRequestRevision")
- .IsRequired();
+ b.Property("PullRequestRevision")
+ .IsRequired();
- b.Property("TitleAtMerge")
- .IsRequired();
+ b.Property("TitleAtMerge")
+ .IsRequired();
- b.Property("Url")
- .IsRequired();
+ b.Property("Url")
+ .IsRequired();
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("MergedById");
+ b.HasIndex("MergedById");
- b.HasIndex("PrimaryRevisionInformationId")
- .IsUnique();
+ b.HasIndex("PrimaryRevisionInformationId")
+ .IsUnique();
- b.ToTable("TestMerges");
- });
+ b.ToTable("TestMerges");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.User", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.User", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("AdministrationRights");
+ b.Property("AdministrationRights");
- b.Property("CanonicalName")
- .IsRequired();
+ b.Property("CanonicalName")
+ .IsRequired();
- b.Property("CreatedAt")
- .IsRequired();
+ b.Property("CreatedAt")
+ .IsRequired();
- b.Property("CreatedById");
+ b.Property("CreatedById");
- b.Property("Enabled")
- .IsRequired();
+ b.Property("Enabled")
+ .IsRequired();
- b.Property("InstanceManagerRights");
+ b.Property("InstanceManagerRights");
- b.Property("LastPasswordUpdate");
+ b.Property("LastPasswordUpdate");
- b.Property("Name")
- .IsRequired();
+ b.Property("Name")
+ .IsRequired();
- b.Property("PasswordHash");
+ b.Property("PasswordHash");
- b.Property("SystemIdentifier");
+ b.Property("SystemIdentifier");
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("CanonicalName")
- .IsUnique();
+ b.HasIndex("CanonicalName")
+ .IsUnique();
- b.HasIndex("CreatedById");
+ b.HasIndex("CreatedById");
- b.ToTable("Users");
- });
+ b.ToTable("Users");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.WatchdogReattachInformation", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
+ modelBuilder.Entity("Tgstation.Server.Host.Models.WatchdogReattachInformation", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
- b.Property("AlphaId");
+ b.Property("AlphaId");
- b.Property("AlphaIsActive");
+ b.Property("AlphaIsActive");
- b.Property("BravoId");
+ b.Property("BravoId");
- b.HasKey("Id");
+ b.HasKey("Id");
- b.HasIndex("AlphaId");
+ b.HasIndex("AlphaId");
- b.HasIndex("BravoId");
+ b.HasIndex("BravoId");
- b.ToTable("WatchdogReattachInformations");
- });
+ b.ToTable("WatchdogReattachInformations");
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
- .WithMany("ChatSettings")
- .HasForeignKey("InstanceId")
- .OnDelete(DeleteBehavior.Cascade);
- });
+ modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+ .WithMany("ChatSettings")
+ .HasForeignKey("InstanceId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
- modelBuilder.Entity("Tgstation.Server.Host.Models.ChatChannel", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.ChatBot", "ChatSettings")
- .WithMany("Channels")
- .HasForeignKey("ChatSettingsId")
- .OnDelete(DeleteBehavior.Cascade);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.CompileJob", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.Job", "Job")
- .WithMany()
- .HasForeignKey("JobId");
-
- b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "RevisionInformation")
- .WithMany("CompileJobs")
- .HasForeignKey("RevisionInformationId")
- .OnDelete(DeleteBehavior.Cascade);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.DreamDaemonSettings", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
- .WithOne("DreamDaemonSettings")
- .HasForeignKey("Tgstation.Server.Host.Models.DreamDaemonSettings", "InstanceId")
- .OnDelete(DeleteBehavior.Cascade);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.DreamMakerSettings", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
- .WithOne("DreamMakerSettings")
- .HasForeignKey("Tgstation.Server.Host.Models.DreamMakerSettings", "InstanceId")
- .OnDelete(DeleteBehavior.Cascade);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.Instance", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.WatchdogReattachInformation", "WatchdogReattachInformation")
- .WithMany()
- .HasForeignKey("WatchdogReattachInformationId");
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.InstanceUser", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
- .WithMany("InstanceUsers")
- .HasForeignKey("InstanceId")
- .OnDelete(DeleteBehavior.Cascade);
-
- b.HasOne("Tgstation.Server.Host.Models.User")
- .WithMany("InstanceUsers")
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.Job", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.User", "CancelledBy")
- .WithMany()
- .HasForeignKey("CancelledById");
-
- b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
- .WithMany("Jobs")
- .HasForeignKey("InstanceId")
- .OnDelete(DeleteBehavior.Cascade);
-
- b.HasOne("Tgstation.Server.Host.Models.User", "StartedBy")
- .WithMany()
- .HasForeignKey("StartedById")
- .OnDelete(DeleteBehavior.Cascade);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.ReattachInformation", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.CompileJob", "CompileJob")
- .WithMany()
- .HasForeignKey("CompileJobId");
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.RepositorySettings", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
- .WithOne("RepositorySettings")
- .HasForeignKey("Tgstation.Server.Host.Models.RepositorySettings", "InstanceId")
- .OnDelete(DeleteBehavior.Cascade);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.RevInfoTestMerge", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "RevisionInformation")
- .WithMany("ActiveTestMerges")
- .HasForeignKey("RevisionInformationId")
- .OnDelete(DeleteBehavior.Cascade);
-
- b.HasOne("Tgstation.Server.Host.Models.TestMerge", "TestMerge")
- .WithMany("RevisonInformations")
- .HasForeignKey("TestMergeId")
- .OnDelete(DeleteBehavior.Cascade);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.RevisionInformation", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
- .WithMany("RevisionInformations")
- .HasForeignKey("InstanceId")
- .OnDelete(DeleteBehavior.Cascade);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.TestMerge", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.User", "MergedBy")
- .WithMany("TestMerges")
- .HasForeignKey("MergedById")
- .OnDelete(DeleteBehavior.Restrict);
-
- b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "PrimaryRevisionInformation")
- .WithOne("PrimaryTestMerge")
- .HasForeignKey("Tgstation.Server.Host.Models.TestMerge", "PrimaryRevisionInformationId")
- .OnDelete(DeleteBehavior.SetNull);
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.User", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.User", "CreatedBy")
- .WithMany("CreatedUsers")
- .HasForeignKey("CreatedById");
- });
-
- modelBuilder.Entity("Tgstation.Server.Host.Models.WatchdogReattachInformation", b =>
- {
- b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Alpha")
- .WithMany()
- .HasForeignKey("AlphaId");
-
- b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Bravo")
- .WithMany()
- .HasForeignKey("BravoId");
- });
+ modelBuilder.Entity("Tgstation.Server.Host.Models.ChatChannel", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.ChatBot", "ChatSettings")
+ .WithMany("Channels")
+ .HasForeignKey("ChatSettingsId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.CompileJob", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.Job", "Job")
+ .WithMany()
+ .HasForeignKey("JobId");
+
+ b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "RevisionInformation")
+ .WithMany("CompileJobs")
+ .HasForeignKey("RevisionInformationId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.DreamDaemonSettings", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+ .WithOne("DreamDaemonSettings")
+ .HasForeignKey("Tgstation.Server.Host.Models.DreamDaemonSettings", "InstanceId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.DreamMakerSettings", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+ .WithOne("DreamMakerSettings")
+ .HasForeignKey("Tgstation.Server.Host.Models.DreamMakerSettings", "InstanceId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.Instance", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.WatchdogReattachInformation", "WatchdogReattachInformation")
+ .WithMany()
+ .HasForeignKey("WatchdogReattachInformationId");
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.InstanceUser", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+ .WithMany("InstanceUsers")
+ .HasForeignKey("InstanceId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("Tgstation.Server.Host.Models.User")
+ .WithMany("InstanceUsers")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.Job", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.User", "CancelledBy")
+ .WithMany()
+ .HasForeignKey("CancelledById");
+
+ b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+ .WithMany("Jobs")
+ .HasForeignKey("InstanceId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("Tgstation.Server.Host.Models.User", "StartedBy")
+ .WithMany()
+ .HasForeignKey("StartedById")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.ReattachInformation", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.CompileJob", "CompileJob")
+ .WithMany()
+ .HasForeignKey("CompileJobId");
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.RepositorySettings", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+ .WithOne("RepositorySettings")
+ .HasForeignKey("Tgstation.Server.Host.Models.RepositorySettings", "InstanceId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.RevInfoTestMerge", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "RevisionInformation")
+ .WithMany("ActiveTestMerges")
+ .HasForeignKey("RevisionInformationId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("Tgstation.Server.Host.Models.TestMerge", "TestMerge")
+ .WithMany("RevisonInformations")
+ .HasForeignKey("TestMergeId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.RevisionInformation", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+ .WithMany("RevisionInformations")
+ .HasForeignKey("InstanceId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.TestMerge", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.User", "MergedBy")
+ .WithMany("TestMerges")
+ .HasForeignKey("MergedById")
+ .OnDelete(DeleteBehavior.Restrict);
+
+ b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "PrimaryRevisionInformation")
+ .WithOne("PrimaryTestMerge")
+ .HasForeignKey("Tgstation.Server.Host.Models.TestMerge", "PrimaryRevisionInformationId")
+ .OnDelete(DeleteBehavior.SetNull);
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.User", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.User", "CreatedBy")
+ .WithMany("CreatedUsers")
+ .HasForeignKey("CreatedById");
+ });
+
+ modelBuilder.Entity("Tgstation.Server.Host.Models.WatchdogReattachInformation", b =>
+ {
+ b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Alpha")
+ .WithMany()
+ .HasForeignKey("AlphaId");
+
+ b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Bravo")
+ .WithMany()
+ .HasForeignKey("BravoId");
+ });
#pragma warning restore 612, 618
- }
- }
+ }
+ }
}
diff --git a/src/Tgstation.Server.Host/Models/Migrations/20180918020726_MYAddMinimumSecurity.cs b/src/Tgstation.Server.Host/Models/Migrations/20180918020726_MYAddMinimumSecurity.cs
index 13a103ac32..95950e251f 100644
--- a/src/Tgstation.Server.Host/Models/Migrations/20180918020726_MYAddMinimumSecurity.cs
+++ b/src/Tgstation.Server.Host/Models/Migrations/20180918020726_MYAddMinimumSecurity.cs
@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Tgstation.Server.Api.Models;
-namespace Tgstation.Server.Host.Migrations
+namespace Tgstation.Server.Host.Models.Migrations
{
///
/// Add the and columns for MySQL/MariaDB
@@ -13,33 +13,33 @@ namespace Tgstation.Server.Host.Migrations
///
/// The to use
protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AddColumn(
- name: "ApiValidationSecurityLevel",
- table: "DreamMakerSettings",
- nullable: false,
- defaultValue: (int)DreamDaemonSecurity.Safe);
+ {
+ migrationBuilder.AddColumn(
+ name: "ApiValidationSecurityLevel",
+ table: "DreamMakerSettings",
+ nullable: false,
+ defaultValue: (int)DreamDaemonSecurity.Safe);
- migrationBuilder.AddColumn(
- name: "MinimumSecurityLevel",
- table: "CompileJobs",
- nullable: false,
- defaultValue: (int)DreamDaemonSecurity.Safe);
- }
+ migrationBuilder.AddColumn(
+ name: "MinimumSecurityLevel",
+ table: "CompileJobs",
+ nullable: false,
+ defaultValue: (int)DreamDaemonSecurity.Safe);
+ }
///
/// Unapplies the migration
///
/// The to use
protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropColumn(
- name: "ApiValidationSecurityLevel",
- table: "DreamMakerSettings");
+ {
+ migrationBuilder.DropColumn(
+ name: "ApiValidationSecurityLevel",
+ table: "DreamMakerSettings");
- migrationBuilder.DropColumn(
- name: "MinimumSecurityLevel",
- table: "CompileJobs");
- }
- }
+ migrationBuilder.DropColumn(
+ name: "MinimumSecurityLevel",
+ table: "CompileJobs");
+ }
+ }
}
diff --git a/src/Tgstation.Server.Host/Models/Migrations/20180918021228_MSAddMinimumSecurity.Designer.cs b/src/Tgstation.Server.Host/Models/Migrations/20180918021228_MSAddMinimumSecurity.Designer.cs
index 0abec67697..6223542618 100644
--- a/src/Tgstation.Server.Host/Models/Migrations/20180918021228_MSAddMinimumSecurity.Designer.cs
+++ b/src/Tgstation.Server.Host/Models/Migrations/20180918021228_MSAddMinimumSecurity.Designer.cs
@@ -5,672 +5,671 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Tgstation.Server.Host.Models;
-namespace Tgstation.Server.Host.Migrations
+namespace Tgstation.Server.Host.Models.Migrations
{
- [DbContext(typeof(SqlServerDatabaseContext))]
- [Migration("20180918021228_MSAddMinimumSecurity")]
- partial class MSAddMinimumSecurity
+ [DbContext(typeof(SqlServerDatabaseContext))]
+ [Migration("20180918021228_MSAddMinimumSecurity")]
+ partial class MSAddMinimumSecurity
{
///
/// Builds the target model
///
/// The to use
protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
+ {
#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "2.1.3-rtm-32065")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+ modelBuilder
+ .HasAnnotation("ProductVersion", "2.1.3-rtm-32065")
+ .HasAnnotation("Relational:MaxIdentifierLength", 128)
+ .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
- modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+ modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
- b.Property("ConnectionString")
- .IsRequired();
+ b.Property