From adbc02a7c1604d4f0fa0091d6ca78bbc6687646b Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 23 Jul 2018 15:09:14 -0400 Subject: [PATCH] Delete server settings. Remove soft stop. Posting an Administration API model should always reboot it --- .../Models/Administration.cs | 8 +------ .../Models/Internal/ServerSettings.cs | 23 ------------------- .../Models/DatabaseContext.cs | 15 ------------ .../Models/IDatabaseContext.cs | 7 ------ .../Models/ServerSettings.cs | 11 --------- 5 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 src/Tgstation.Server.Api/Models/Internal/ServerSettings.cs delete mode 100644 src/Tgstation.Server.Host/Models/ServerSettings.cs diff --git a/src/Tgstation.Server.Api/Models/Administration.cs b/src/Tgstation.Server.Api/Models/Administration.cs index 640a5c65ac..9e51bd7d3c 100644 --- a/src/Tgstation.Server.Api/Models/Administration.cs +++ b/src/Tgstation.Server.Api/Models/Administration.cs @@ -5,14 +5,8 @@ using Tgstation.Server.Api.Rights; namespace Tgstation.Server.Api.Models { /// - public sealed class Administration : Internal.ServerSettings + public sealed class Administration { - /// - /// If the instances will not be stopped when the server exits. Resets to when the server restarts - /// - [Permissions(ReadRight = AdministrationRights.SoftStop, WriteRight = AdministrationRights.SoftStop)] - public bool SoftStop { get; set; } - /// /// The latest available version of the Tgstation.Server.Host assembly from the upstream repository. If is higher than 's the update cannot be applied due to API changes /// diff --git a/src/Tgstation.Server.Api/Models/Internal/ServerSettings.cs b/src/Tgstation.Server.Api/Models/Internal/ServerSettings.cs deleted file mode 100644 index 3ab52adef5..0000000000 --- a/src/Tgstation.Server.Api/Models/Internal/ServerSettings.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Tgstation.Server.Api.Rights; - -namespace Tgstation.Server.Api.Models.Internal -{ - /// - /// Metadata about an installation - /// - [Model(RightsType.Administration)] - public class ServerSettings - { - /// - /// Automatically send unhandled exception data to a public collection service. This will be limited to system information, path data, and game code compilation information. - /// - [Permissions(ReadRight = AdministrationRights.ChangeTelemetry, WriteRight = AdministrationRights.ChangeTelemetry)] - public bool EnableTelemetry { get; set; } - - /// - /// The git repository URL to recieve updates to Tgstation.Server.Host from, must include credentials if necessary. If set to upstream pulls will be disabled entirely. Should be https://github.com/tgstation/tgstation-server or a fork of it - /// - [Permissions(ReadRight = AdministrationRights.SetUpstreamRepository, WriteRight = AdministrationRights.SetUpstreamRepository)] - public string UpstreamRepository { get; set; } - } -} diff --git a/src/Tgstation.Server.Host/Models/DatabaseContext.cs b/src/Tgstation.Server.Host/Models/DatabaseContext.cs index 44099444d8..c9bacb6086 100644 --- a/src/Tgstation.Server.Host/Models/DatabaseContext.cs +++ b/src/Tgstation.Server.Host/Models/DatabaseContext.cs @@ -14,9 +14,6 @@ namespace Tgstation.Server.Host.Models /// abstract class DatabaseContext : DbContext, IDatabaseContext where TParentContext : DbContext { - /// - public DbSet ServerSettings { get; set; } - /// public DbSet Users { get; set; } @@ -126,18 +123,6 @@ namespace Tgstation.Server.Host.Models base.OnConfiguring(optionsBuilder); } - /// - public async Task GetServerSettings(CancellationToken cancellationToken) - { - var settings = await ServerSettings.FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false); - if (settings == default(ServerSettings)) - { - settings = new ServerSettings(); - ServerSettings.Add(settings); - } - return settings; - } - /// public async Task Initialize(CancellationToken cancellationToken) { diff --git a/src/Tgstation.Server.Host/Models/IDatabaseContext.cs b/src/Tgstation.Server.Host/Models/IDatabaseContext.cs index 9e8d906905..0d3814a284 100644 --- a/src/Tgstation.Server.Host/Models/IDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Models/IDatabaseContext.cs @@ -59,13 +59,6 @@ namespace Tgstation.Server.Host.Models /// DbSet RepositorySettings { get; set; } - /// - /// Get the in the - /// - /// The for the operation - /// A resulting in the in the - Task GetServerSettings(CancellationToken cancellationToken); - /// /// Saves changes made to the /// diff --git a/src/Tgstation.Server.Host/Models/ServerSettings.cs b/src/Tgstation.Server.Host/Models/ServerSettings.cs deleted file mode 100644 index 4326d9f563..0000000000 --- a/src/Tgstation.Server.Host/Models/ServerSettings.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Tgstation.Server.Host.Models -{ - /// - public sealed class ServerSettings : Api.Models.Internal.ServerSettings - { - /// - /// The row Id - /// - public long Id { get; set; } - } -}