From 7ce692a0219e60d96c92c6358e9f4657a96bffd5 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sat, 12 Oct 2024 09:57:31 -0400 Subject: [PATCH 1/2] ninja edit --- .../CIPP/Extensions/Invoke-ExecExtensionsConfig.ps1 | 10 +++++----- .../Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionsConfig.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionsConfig.ps1 index 9291fc5ea880..60ba2aa4adca 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionsConfig.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionsConfig.ps1 @@ -32,10 +32,10 @@ Function Invoke-ExecExtensionsConfig { # Check if NinjaOne URL is set correctly and the instance has at least version 5.6 if ($Body.NinjaOne) { $AllowedNinjaHostnames = @( - 'app.ninjarmmm.com', - 'eu.ninjarmmm.com', - 'oc.ninjarmmm.com', - 'ca.ninjarmmm.com', + 'app.ninjarmm.com', + 'eu.ninjarmm.com', + 'oc.ninjarmm.com', + 'ca.ninjarmm.com', 'us2.ninjarmm.com' ) $SetNinjaHostname = $Body.NinjaOne.Instance -replace '/ws', '' -replace 'https://', '' @@ -46,7 +46,7 @@ Function Invoke-ExecExtensionsConfig { try { [version]$Version = (Invoke-WebRequest -Method GET -Uri "$SetNinjaHostname/app-version.txt" -ea stop).content } catch { - throw "Failed to connect to NinjaOne check your Instance is set correctly eg 'app.ninjarmmm.com'" + throw "Failed to connect to NinjaOne check your Instance is set correctly eg 'app.ninjarmm.com'" } if ($Version -lt [version]'5.6.0.0') { throw 'NinjaOne 5.6.0.0 is required.' diff --git a/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 b/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 index bcfc085b434a..d45407edb06e 100644 --- a/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 +++ b/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 @@ -60,10 +60,10 @@ function Invoke-NinjaOneTenantSync { $Configuration = ((Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json).NinjaOne $AllowedNinjaHostnames = @( - 'app.ninjarmmm.com', - 'eu.ninjarmmm.com', - 'oc.ninjarmmm.com', - 'ca.ninjarmmm.com', + 'app.ninjarmm.com', + 'eu.ninjarmm.com', + 'oc.ninjarmm.com', + 'ca.ninjarmm.com', 'us2.ninjarmm.com' ) From eeb906869060b4fdad000d46d28c851ae82c840b Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sat, 12 Oct 2024 09:59:00 -0400 Subject: [PATCH 2/2] up version --- version_latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_latest.txt b/version_latest.txt index a194c18e86e8..fa09f584d78e 100644 --- a/version_latest.txt +++ b/version_latest.txt @@ -1 +1 @@ -6.5.1 +6.5.2 \ No newline at end of file