From 4ac250686ad493824b50e3c0397d4952a09eeb7c Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 15 Sep 2022 17:14:57 +0000 Subject: [PATCH] --- docs/docs/deploy-ayanova.md | 30 +++++++++++++++++++ util/RavenKeyFactory.cs | 3 ++ wwwroot/js/app.ravLicense.js | 7 +++++ .../js/templates/app.ravLicense.handlebars | 19 ++++++++++-- 4 files changed, 56 insertions(+), 3 deletions(-) diff --git a/docs/docs/deploy-ayanova.md b/docs/docs/deploy-ayanova.md index b9a92e8..822e22e 100644 --- a/docs/docs/deploy-ayanova.md +++ b/docs/docs/deploy-ayanova.md @@ -19,6 +19,8 @@ Run the appropriate for build type being tested standard upgrade script (except #### PERPETUAL BUILD +##### Next staging build + ```bash cd /var/ayanova && \ sudo systemctl stop ayanova.service && \ @@ -30,8 +32,23 @@ sudo unzip -o ayanova-linux-x64-server.zip -x "config.json" && \ sudo systemctl start ayanova.service ``` +##### public release build + +```bash +cd /var/ayanova && \ +sudo systemctl stop ayanova.service && \ +sudo curl -O https://www.ayanova.com/download/ayanova-linux-x64-server.zip && \ +sudo rm *.dll && \ +sudo rm -r ./resource && \ +sudo rm -r ./wwwroot && \ +sudo unzip -o ayanova-linux-x64-server.zip -x "config.json" && \ +sudo systemctl start ayanova.service +``` + #### SUBSCRIPTION BUILD +##### Next staging build + ```bash cd /var/ayanova && \ sudo systemctl stop ayanova.service && \ @@ -43,6 +60,19 @@ sudo unzip -o ayanova-subscription-linux-x64-server.zip -x "config.json" && \ sudo systemctl start ayanova.service ``` +##### public release build + +```bash +cd /var/ayanova && \ +sudo systemctl stop ayanova.service && \ +sudo curl -O https://www.ayanova.com/download/ayanova-subscription-linux-x64-server.zip && \ +sudo rm *.dll && \ +sudo rm -r ./resource && \ +sudo rm -r ./wwwroot && \ +sudo unzip -o ayanova-subscription-linux-x64-server.zip -x "config.json" && \ +sudo systemctl start ayanova.service +``` + ### Test install to windows server Run installer on Windows test server. diff --git a/util/RavenKeyFactory.cs b/util/RavenKeyFactory.cs index d67fc82..be570ad 100644 --- a/util/RavenKeyFactory.cs +++ b/util/RavenKeyFactory.cs @@ -32,6 +32,7 @@ namespace rockfishCore.Util //SUBSCRIPTION private const string ACTIVE_INTERNAL_USERS_FEATURE_NAME = "ActiveInternalUsers"; private const string ACTIVE_CUSTOMER_USERS_FEATURE_NAME = "ActiveCustomerUsers"; + private const string MAXIMUM_DATA_GB_FEATURE_NAME = "MaximumDataGB"; //Add-on's / integrations @@ -238,6 +239,7 @@ namespace rockfishCore.Util //5k inside staff users will cover huge seeding level easily k.Features.Add(new LicenseFeature() { Feature = ACTIVE_INTERNAL_USERS_FEATURE_NAME, Count = 5000 }); k.Features.Add(new LicenseFeature() { Feature = ACTIVE_CUSTOMER_USERS_FEATURE_NAME, Count = 20000 }); + k.Features.Add(new LicenseFeature() { Feature = MAXIMUM_DATA_GB_FEATURE_NAME, Count = 20 }); } return GenerateRavenKey(k); } @@ -268,6 +270,7 @@ namespace rockfishCore.Util //5k inside staff users will cover huge seeding level easily k.Features.Add(new LicenseFeature() { Feature = ACTIVE_INTERNAL_USERS_FEATURE_NAME, Count = 5000 }); k.Features.Add(new LicenseFeature() { Feature = ACTIVE_CUSTOMER_USERS_FEATURE_NAME, Count = 20000 }); + k.Features.Add(new LicenseFeature() { Feature = MAXIMUM_DATA_GB_FEATURE_NAME, Count = 20 }); } diff --git a/wwwroot/js/app.ravLicense.js b/wwwroot/js/app.ravLicense.js index 9c8ba38..c146af5 100644 --- a/wwwroot/js/app.ravLicense.js +++ b/wwwroot/js/app.ravLicense.js @@ -94,6 +94,11 @@ app.ravLicense = (function () { Feature: "ActiveCustomerUsers", Count: Number($("#subcustcount").val()) }); + + features.push({ + Feature: "MaximumDataGB", + Count: Number($("#submaxdatagb").val()) + }); } let options = $("#options").val(); @@ -140,6 +145,8 @@ app.ravLicense = (function () { $("#perpetusercountblock").toggleClass("d-none"); $("#subusercountblock").toggleClass("d-none"); $("#subcustcountblock").toggleClass("d-none"); + $("#submaxdatagbblock").toggleClass("d-none"); + const isPerpetual = $("#perpetual").prop("checked"); $("#licenseExpires").prop("checked", !isPerpetual); diff --git a/wwwroot/js/templates/app.ravLicense.handlebars b/wwwroot/js/templates/app.ravLicense.handlebars index 9f4792a..7d4bad2 100644 --- a/wwwroot/js/templates/app.ravLicense.handlebars +++ b/wwwroot/js/templates/app.ravLicense.handlebars @@ -124,7 +124,7 @@
- +
+
+
+ + +
+
+
@@ -145,8 +158,8 @@ multiple > - {{!-- - --}} + {{! + }}