Merge branch 'KelvinTegelaar:master' into master

Tetrabyte · Sep 2, 2024 · b3053ff · b3053ff
2 parents 7381c58 + 73d8b96
commit b3053ff
Show file tree

Hide file tree

Showing 127 changed files with 1,563 additions and 325,118 deletions.
diff --git a/.github/workflows/master_cippwuxwa.yml b/.github/workflows/master_cippwuxwa.yml
diff --git a/Activity_AddOrUpdateTableRows/function.json b/Activity_AddOrUpdateTableRows/function.json
diff --git a/Activity_AddOrUpdateTableRows/run.ps1 b/Activity_AddOrUpdateTableRows/run.ps1
diff --git a/Activity_GetAllTableRows/function.json b/Activity_GetAllTableRows/function.json
diff --git a/Activity_GetAllTableRows/run.ps1 b/Activity_GetAllTableRows/run.ps1
diff --git a/AddAlertSubscription_Queue/function.json b/AddAlertSubscription_Queue/function.json
@@ -1,5 +1,5 @@
 {
-  "scriptFile": "../Modules/CippEntryPoints/CippEntryPoints.psm1",
+  "scriptFile": "../Modules/CippEntrypoints/CippEntrypoints.psm1",
   "entryPoint": "Receive-CippQueueTrigger",
   "bindings": [
     {

diff --git a/AddChocoApp_OrchestrationStarter/function.json b/AddChocoApp_OrchestrationStarter/function.json
diff --git a/AddChocoApp_OrchestrationStarter/run.ps1 b/AddChocoApp_OrchestrationStarter/run.ps1
diff --git a/AddChocoApp_OrchestrationStarterTimer/run.ps1 b/AddChocoApp_OrchestrationStarterTimer/run.ps1
@@ -1,19 +1,7 @@
 param($Timer)
 
 try {
-    if ($CurrentlyRunning) {
-        $Results = [pscustomobject]@{'Results' = 'Already running. Please wait for the current instance to finish' }
-        Write-LogMessage -API 'ChocoApps' -message 'Attempted to start upload but an instance was already running.' -sev Info
-    }
-    else {
-        $InstanceId = Start-NewOrchestration -FunctionName 'Applications_Orchestrator'
-        Write-Host "Started orchestration with ID = '$InstanceId'"
-        $Orchestrator = New-OrchestrationCheckStatusResponse -Request $Timer -InstanceId $InstanceId
-        Write-LogMessage -API 'ChocoApps' -message 'Started uploading applications to tenants' -sev Info
-        $Results = [pscustomobject]@{'Results' = 'Started running analysis' }
-    }
-    Write-Host ($Orchestrator | ConvertTo-Json)
-}
-catch {
+    Start-ApplicationOrchestrator
+} catch {
     Write-Host "AddChocoApp_OrchestratorStarterTimer Exception: $($_.Exception.Message)"
 }
diff --git a/AddMSPApp/Immybot.app.json b/AddMSPApp/Immybot.app.json
@@ -7,7 +7,7 @@
   "owner": " ",
   "informationUrl": " ",
   "privacyInformationUrl": " ",
-  "fileName": "ninjarmm.intunewin",
+  "fileName": "immybot.intunewin",
   "@odata.type": "#microsoft.graph.win32LobApp",
   "applicableArchitectures": "x86, x64",
 
@@ -19,7 +19,7 @@
   "detectionRules": [
     {
       "@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
-      "path": "%ProgramData%\\Immyboy\\Bin",
+      "path": "%ProgramData%\\Immybot\\Bin",
       "fileOrFolderName": "Immybot.exe",
       "check32BitOn64System": false,
       "detectionType": "exists"

diff --git a/AddMSPApp/ninjarmm.app.json b/AddMSPApp/ninjarmm.app.json
@@ -19,8 +19,8 @@
   "detectionRules": [
     {
       "@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
-      "path": "%ProgramData%\\Syncro\\Bin",
-      "fileOrFolderName": "Syncro.Overmind.Service.exe",
+      "path": "%ProgramData%\\NinjaRMMAgent",
+      "fileOrFolderName": "ninjarmm-cli.exe",
       "check32BitOn64System": false,
       "detectionType": "exists"
     }

diff --git a/Applications_GetQueue/function.json b/Applications_GetQueue/function.json
diff --git a/Applications_GetQueue/run.ps1 b/Applications_GetQueue/run.ps1
diff --git a/Applications_Orchestrator/function.json b/Applications_Orchestrator/function.json
diff --git a/Applications_Orchestrator/run.ps1 b/Applications_Orchestrator/run.ps1
diff --git a/Applications_Upload/function.json b/Applications_Upload/function.json
diff --git a/Applications_Upload/run.ps1 b/Applications_Upload/run.ps1
diff --git a/BestPracticeAnalyser_OrchestrationStarter/function.json b/BestPracticeAnalyser_OrchestrationStarter/function.json