From 90946f90b1a2061ac0e78ddac2467d42effb437e Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 16 Aug 2022 02:45:32 +0000 Subject: [PATCH] 8.0.3 release --- notes/deploy.txt | 7 +- util/RavenKeyFactory.cs | 49 ++++---- util/RfVersion.cs | 2 +- wwwroot/default.htm | 112 +++++++++--------- .../js/templates/app.ravLicense.handlebars | 6 +- 5 files changed, 91 insertions(+), 85 deletions(-) diff --git a/notes/deploy.txt b/notes/deploy.txt index 8ff59fd..fb9a81b 100644 --- a/notes/deploy.txt +++ b/notes/deploy.txt @@ -20,10 +20,13 @@ dotnet publish -c Release -o ./../publish/ --no-self-contained -r linux-x64 2.7) in rockfish.last to remove **ALL** files and folders!! DANGER: /srv/coreapps/rockfish.last# rm * -r -2.8) BACKUP backup old version and db etc with this command run from /srv/coreapps folder: +2.71) STOP rockfish service + systemctl stop kestrel-rockfish.service +2.8) BACKUP backup old version and db etc with this command: + in rockfish.last to copy over all current rockfish files and folders: root@ubuntu-s-1vcpu-1gb-amd-sfo3-01:/srv/coreapps/rockfish.last# cp -a ../rockfish/. . @@ -35,6 +38,8 @@ If it won't start it's likely the .json config files are not present, copy back 3) COPY Copy over to production server, safest is all files from publish into /srv/coreapps/rockfish +SKIP json files + .NET Core apps: /srv/coreapps only need the .dll and the wwwroot folder contents, remember not to delete the folders on the server only replace their contents because there are file permissions set diff --git a/util/RavenKeyFactory.cs b/util/RavenKeyFactory.cs index a1b37cf..686536b 100644 --- a/util/RavenKeyFactory.cs +++ b/util/RavenKeyFactory.cs @@ -25,13 +25,14 @@ namespace rockfishCore.Util //Scheduleable users private const string SERVICE_TECHS_FEATURE_NAME = "ServiceTechs"; //Add-on's / integrations - private const string OLI_FEATURE_NAME = "OLI"; - private const string QBI_FEATURE_NAME = "QBI"; - private const string QBOI_FEATURE_NAME = "QBOI"; + //thse are now included so not relevant here but keeping for renaming for future subscription add-on's + // private const string OLI_FEATURE_NAME = "OLI"; + // private const string QBI_FEATURE_NAME = "QBI"; + // private const string QBOI_FEATURE_NAME = "QBOI"; //This feature name means it's a trial key private const string TRIAL_FEATURE_NAME = "TrialMode"; //This feature name means it's a SAAS or rental mode key for month to month hosted service - private const string RENTAL_FEATURE_NAME = "Subscription"; + private const string SUBSCRIPTION_FEATURE_NAME = "Subscription"; #region license classes @@ -92,21 +93,21 @@ Plugins: sb.AppendLine("Temporary license for evaluation"); continue; } - if (f.Feature == RENTAL_FEATURE_NAME) + if (f.Feature == SUBSCRIPTION_FEATURE_NAME) { - sb.AppendLine("Service / Rental license"); - continue; - } - if (f.Feature == QBI_FEATURE_NAME) - { - sb.AppendLine("QuickBooks desktop integration option"); - continue; - } - if (f.Feature == QBOI_FEATURE_NAME) - { - sb.AppendLine("QuickBooks online integration option"); + sb.AppendLine("Subscription license"); continue; } + // if (f.Feature == QBI_FEATURE_NAME) + // { + // sb.AppendLine("QuickBooks desktop integration option"); + // continue; + // } + // if (f.Feature == QBOI_FEATURE_NAME) + // { + // sb.AppendLine("QuickBooks online integration option"); + // continue; + // } if (f.Feature == SERVICE_TECHS_FEATURE_NAME) { sb.AppendLine($"Scheduleable resources: {f.Count}"); @@ -215,7 +216,7 @@ Plugins: { get { - return HasLicenseFeature(RENTAL_FEATURE_NAME); + return HasLicenseFeature(SUBSCRIPTION_FEATURE_NAME); } } @@ -292,11 +293,11 @@ Plugins: //flag as trial key not regular key k.Features.Add(new LicenseFeature() { Feature = TRIAL_FEATURE_NAME, Count = 0 }); //flag it as a temporary expiring key so that the expiration date takes effect - k.Features.Add(new LicenseFeature() { Feature = RENTAL_FEATURE_NAME, Count = 0 }); + k.Features.Add(new LicenseFeature() { Feature = SUBSCRIPTION_FEATURE_NAME, Count = 0 }); //add every possible feature - k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 }); - k.Features.Add(new LicenseFeature() { Feature = SERVICE_TECHS_FEATURE_NAME, Count = 1000 }); + //k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 }); + k.Features.Add(new LicenseFeature() { Feature = SERVICE_TECHS_FEATURE_NAME, Count = 100 }); return GenerateRavenKey(k); } @@ -475,13 +476,13 @@ oArP0E2Vbow3JMxq/oeXmHbrLMLQfYyXwFmciLFigOtkd45bfHdrbA== k.LicenseFormat = "8"; k.RegisteredTo = "GZ TestCo Inc."; k.DbId = dbid; - k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 }); - k.Features.Add(new LicenseFeature() { Feature = QBOI_FEATURE_NAME, Count = 0 }); - k.Features.Add(new LicenseFeature() { Feature = OLI_FEATURE_NAME, Count = 0 }); + // k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 }); + // k.Features.Add(new LicenseFeature() { Feature = QBOI_FEATURE_NAME, Count = 0 }); + // k.Features.Add(new LicenseFeature() { Feature = OLI_FEATURE_NAME, Count = 0 }); k.Features.Add(new LicenseFeature() { Feature = SERVICE_TECHS_FEATURE_NAME, Count = 1000 }); k.MaintenanceExpiration = k.LicenseExpiration = DateTime.UtcNow.AddMonths(1); k.Features.Add(new LicenseFeature() { Feature = TRIAL_FEATURE_NAME, Count = 0 }); - k.Features.Add(new LicenseFeature() { Feature = RENTAL_FEATURE_NAME, Count = 0 }); + k.Features.Add(new LicenseFeature() { Feature = SUBSCRIPTION_FEATURE_NAME, Count = 0 }); return GenerateRavenKey(k); } diff --git a/util/RfVersion.cs b/util/RfVersion.cs index ebe8e9d..18d227e 100644 --- a/util/RfVersion.cs +++ b/util/RfVersion.cs @@ -2,7 +2,7 @@ namespace rockfishCore.Util { public static class RfVersion { - public const string NumberOnly="6.16"; + public const string NumberOnly="6.17"; public const string Full = "Rockfish server " + NumberOnly; } } \ No newline at end of file diff --git a/wwwroot/default.htm b/wwwroot/default.htm index a02c519..d42ed7d 100644 --- a/wwwroot/default.htm +++ b/wwwroot/default.htm @@ -11,73 +11,73 @@ Rockfish loading.... - - - - - + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + \ No newline at end of file diff --git a/wwwroot/js/templates/app.ravLicense.handlebars b/wwwroot/js/templates/app.ravLicense.handlebars index 5f3ec76..3ae1cc3 100644 --- a/wwwroot/js/templates/app.ravLicense.handlebars +++ b/wwwroot/js/templates/app.ravLicense.handlebars @@ -49,9 +49,9 @@