Skip to content

Commit

Permalink
Merge branch 'KelvinTegelaar:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
CentralizedServices authored Dec 6, 2023
2 parents 1c2ac45 + 73e032d commit e6d4bf7
Show file tree
Hide file tree
Showing 86 changed files with 1,832 additions and 1,080 deletions.
24 changes: 0 additions & 24 deletions AddChocoApp/function.json

This file was deleted.

58 changes: 0 additions & 58 deletions AddChocoApp/run.ps1

This file was deleted.

65 changes: 65 additions & 0 deletions AddMSPApp/Immybot.app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"displayName": "",
"installCommandLine": "",
"uninstallCommandLine": "",
"description": " ",
"developer": " ",
"owner": " ",
"informationUrl": " ",
"privacyInformationUrl": " ",
"fileName": "ninjarmm.intunewin",
"@odata.type": "#microsoft.graph.win32LobApp",
"applicableArchitectures": "x86, x64",

"installExperience": {
"runAsAccount": "system",
"deviceRestartBehavior": "suppress",
"@odata.type": "microsoft.graph.win32LobAppInstallExperience"
},
"detectionRules": [
{
"@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
"path": "%ProgramData%\\Immyboy\\Bin",
"fileOrFolderName": "Immybot.exe",
"check32BitOn64System": false,
"detectionType": "exists"
}
],
"returncode": [
{
"returnCode": 0,
"type": "success",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 1707,
"type": "Success",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 1641,
"type": "hardReboot",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 1618,
"type": "retry",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 3010,
"type": "softReboot",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
}
],
"minimumNumberOfProcessors": "1",
"minimumFreeDiskSpaceInMB": "8",
"minimumCpuSpeedInMHz": "4",
"minimumSupportedOperatingSystem": {
"@odata.type": "microsoft.graph.windowsMinimumOperatingSystem",
"v10_1607": true
},
"notes": "CIPP Uploaded application",
"minimumMemoryInMB": "1",
"setupFilePath": "install.ps1"
}
64 changes: 64 additions & 0 deletions AddMSPApp/automate.app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"displayName": "",
"installCommandLine": "",
"uninstallCommandLine": "",
"description": " ",
"developer": " ",
"owner": " ",
"informationUrl": " ",
"privacyInformationUrl": " ",
"fileName": "automate.intunewin",
"@odata.type": "#microsoft.graph.win32LobApp",
"applicableArchitectures": "x86, x64",

"installExperience": {
"runAsAccount": "system",
"deviceRestartBehavior": "suppress",
"@odata.type": "microsoft.graph.win32LobAppInstallExperience"
},
"detectionRules": [
{
"@odata.type": "#microsoft.graph.win32LobAppPowerShellScriptDetection",
"enforceSignatureCheck": false,
"runAs32Bit": false,
"scriptContent": ""
}
],
"returncode": [
{
"returnCode": 0,
"type": "success",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 1707,
"type": "Success",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 1641,
"type": "hardReboot",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 1618,
"type": "retry",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 3010,
"type": "softReboot",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
}
],
"minimumNumberOfProcessors": "1",
"minimumFreeDiskSpaceInMB": "8",
"minimumCpuSpeedInMHz": "4",
"minimumSupportedOperatingSystem": {
"@odata.type": "microsoft.graph.windowsMinimumOperatingSystem",
"v10_1607": true
},
"notes": "CIPP Uploaded application",
"minimumMemoryInMB": "1",
"setupFilePath": "install.ps1"
}
16 changes: 16 additions & 0 deletions AddMSPApp/automate.app.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.4.0">
<Name>install.ps1</Name>
<UnencryptedContentSize>2117</UnencryptedContentSize>
<FileName>automate.intunewin</FileName>
<SetupFile>install.ps1</SetupFile>
<EncryptionInfo>
<EncryptionKey>TL5w2kSbhW0+Vb/ngucj1fIa7YfAnFG/d+U3o/qGG24=</EncryptionKey>
<MacKey>NGPnJKKQIPM4yD4dCJ0GVCF0pqFsLX2TCb040bjLBBg=</MacKey>
<InitializationVector>QGvxYMYrgYovA6uo9XQ60w==</InitializationVector>
<Mac>Q8PF4sGPbuxDyoQpmJUGVLvZw9hGhOBX0IhQNeeQEHk=</Mac>
<ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
<FileDigest>49a2kb03OrNyDt0eZHSpSARq9HzvQL0IrBkcPffwC4M=</FileDigest>
<FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
</EncryptionInfo>
</ApplicationInfo>
29 changes: 29 additions & 0 deletions AddMSPApp/automate.detection.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
$ServerAddress = '##SERVER##'
if (Get-Module -ListAvailable -Name ConnectWiseAutomateAgent) {
Import-Module ConnectWiseAutomateAgent
}
else {
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
Install-Module -Name PowerShellGet -Force -AllowClobber
Update-Module -Name PowerShellGet
Set-PSRepository -Name 'PSGallery' -InstallationPolicy Trusted
Install-Module ConnectWiseAutomateAgent -MinimumVersion 0.1.2.0 -Confirm:$false -Force
}

Invoke-CWAACommand -Command 'Send Status'
Start-Sleep -Seconds 20

$AgentInfo = Get-CWAAInfo
$ServerPassword = ConvertFrom-CWAASecurity $AgentInfo.ServerPassword
$LastContact = try { Get-Date $AgentInfo.LastSuccessStatus } catch { $null }


if ($AgentInfo.ID -gt 0 -and $LastContact -gt (Get-Date).AddDays(-30) -and $AgentInfo.Server -contains $ServerAddress -and $ServerPassword -ne 'Enter the server password here.') {
Write-Output 'SUCCESS: Agent is healthy'
exit 0
}
else {
Write-Output 'ERROR: Agent is not healthy'
Write-Output ($AgentInfo | Select-Object ID, LocationID, LastSuccessStatus, Server | ConvertTo-Json)
exit 1
}
Binary file added AddMSPApp/automate.intunewin
Binary file not shown.
65 changes: 65 additions & 0 deletions AddMSPApp/cwcommand.app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"displayName": "",
"installCommandLine": "",
"uninstallCommandLine": "",
"description": " ",
"developer": " ",
"owner": " ",
"informationUrl": " ",
"privacyInformationUrl": " ",
"fileName": "cwcommand.intunewin",
"@odata.type": "#microsoft.graph.win32LobApp",
"applicableArchitectures": "x86, x64",

"installExperience": {
"runAsAccount": "system",
"deviceRestartBehavior": "suppress",
"@odata.type": "microsoft.graph.win32LobAppInstallExperience"
},
"detectionRules": [
{
"@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
"path": "%ProgramFiles(x86)%\\ITSPlatform\\agentcore\\",
"fileOrFolderName": "platform-agent-core.exe",
"check32BitOn64System": false,
"detectionType": "exists"
}
],
"returncode": [
{
"returnCode": 0,
"type": "success",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 1707,
"type": "Success",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 1641,
"type": "hardReboot",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 1618,
"type": "retry",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
},
{
"returnCode": 3010,
"type": "softReboot",
"@odata.type": "#microsoft.graph.win32LobAppReturnCode"
}
],
"minimumNumberOfProcessors": "1",
"minimumFreeDiskSpaceInMB": "8",
"minimumCpuSpeedInMHz": "4",
"minimumSupportedOperatingSystem": {
"@odata.type": "microsoft.graph.windowsMinimumOperatingSystem",
"v10_1607": true
},
"notes": "CIPP Uploaded application",
"minimumMemoryInMB": "1",
"setupFilePath": "install.ps1"
}
16 changes: 16 additions & 0 deletions AddMSPApp/cwcommand.app.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.4.0">
<Name>install.ps1</Name>
<UnencryptedContentSize>2717</UnencryptedContentSize>
<FileName>cwcommand.intunewin</FileName>
<SetupFile>install.ps1</SetupFile>
<EncryptionInfo>
<EncryptionKey>6bilNd8M34xxoOl/marQi04r0PjYRD0YUuVf5hR/cVY=</EncryptionKey>
<MacKey>QIeCE2WnKhg/yyyN2Vd7WBqy/9Vo22oOY+jN+o7NsM8=</MacKey>
<InitializationVector>fPjQqWF6INy3aAXKeGIlig==</InitializationVector>
<Mac>qWx8/p2CoO2vuP/Dkr7KJw7JoxhmcA4XSj2ictbcC7M=</Mac>
<ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
<FileDigest>fslGge4BZ0F//6xgGCNIIVY5VPr/B2Ms1sGI7RiA9Bo=</FileDigest>
<FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
</EncryptionInfo>
</ApplicationInfo>
Binary file added AddMSPApp/cwcommand.intunewin
Binary file not shown.
Loading

0 comments on commit e6d4bf7

Please sign in to comment.