Merge pull request #95 from datalust/dev

2021.1 Release

Author: nblumhardt

src/Seq.Api/Model/Backups/BackupEntity.cs

@@ -16,7 +16,7 @@ namespace Seq.Api.Model.Backups
 {
     /// <summary>
     /// Seq backups include metadata like users, signals, API keys and other configuration, but do not include
-    /// the event stream. Backups are fully encrypted with AES-256 and cannot be restored without the master key
+    /// the event stream. Backups are fully encrypted with AES-256 and cannot be restored without the secret key
     /// from the originating Seq instance.
     /// </summary>
     public class BackupEntity : Entity

src/Seq.Api/Model/Settings/SettingName.cs

@@ -115,11 +115,6 @@ public enum SettingName
         /// </summary>
         IsAuthenticationEnabled,
 
-        /// <summary>
-        /// Tracks whether an admin user has dismissed the master key backup warning.
-        /// </summary>
-        MasterKeyIsBackedUp,
-
         /// <summary>
         /// The minimum storage space, in bytes, on the disk containing log events, before
         /// Seq will stop accepting new events.
@@ -186,7 +181,12 @@ public enum SettingName
         /// The maximum size, in HTTP request content bytes, beyond which ingestion requests will be rejected.
         /// </summary>
         RawPayloadMaximumContentLength,
-
+        
+        /// <summary>
+        /// Tracks whether an admin user has dismissed the secret key backup warning.
+        /// </summary>
+        SecretKeyIsBackedUp,
+        
         /// <summary>
         /// A snippet of CSS that will be included in the front-end's user interface styles.
         /// </summary>

src/Seq.Api/ResourceGroups/BackupsResourceGroup.cs

@@ -23,7 +23,7 @@ namespace Seq.Api.ResourceGroups
 {
     /// <summary>
     /// Perform operations on backups. Seq backups include metadata like users, signals, API keys and other configuration, but do not include
-    /// the event stream. Backups are fully encrypted with AES-256 and cannot be restored without the master key from the originating Seq instance.
+    /// the event stream. Backups are fully encrypted with AES-256 and cannot be restored without the secret key from the originating Seq instance.
     /// </summary>
     public class BackupsResourceGroup : ApiResourceGroup
     {

src/Seq.Api/Seq.Api.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Client library for the Seq HTTP API.</Description>
-    <VersionPrefix>2020.5.0</VersionPrefix>
+    <VersionPrefix>2021.1.0</VersionPrefix>
     <Authors>Datalust;Contributors</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>