Skip to content

Commit d28bad2

Browse files
isgq-github01isgq-github01
authored
Merge pull request #53 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents 7b3c838 + d4830f6 commit d28bad2

1,075 files changed

Lines changed: 128484 additions & 75639 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.env.example‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FUNCTIONS_WORKER_RUNTIME='powershell'
2+
FUNCTIONS_WORKER_RUNTIME_VERSION='7.4'
3+
AzureWebJobsStorage='DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNoBnZf6KgBVU4=;BlobEndpoint=http://azurite:10000/devstoreaccount1;QueueEndpoint=http://azurite:10001/devstoreaccount1;TableEndpoint=http://azurite:10002/devstoreaccount1;'
4+
DEV_SKIP_BPA_TIMER='true'
5+
DEV_SKIP_DOMAIN_TIMER='true'
6+
FUNCTIONS_EXTENSION_VERSION='4'
7+
NonLocalHostAzurite='true'

‎.github/workflows/dev_clouduptest.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
2+
# More GitHub Actions for Azure: https://github.com/Azure/actions
3+
4+
name: Build and deploy Powershell project to Azure Function App - clouduptest
5+
6+
on:
7+
push:
8+
branches:
9+
- dev
10+
workflow_dispatch:
11+
12+
env:
13+
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
14+
15+
jobs:
16+
deploy:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: 'Checkout GitHub Action'
21+
uses: actions/checkout@v4
22+
23+
- name: 'Run Azure Functions Action'
24+
uses: Azure/functions-action@v1
25+
id: fa
26+
with:
27+
app-name: 'clouduptest'
28+
slot-name: 'Production'
29+
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_9B9E8B9A9BBE446188BCA9F126A1B646 }}
31+
sku: 'flexconsumption'
32+

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ Logs
99
ExcludedTenants
1010
SendNotifications/config.json
1111
.env
12+
13+
14+
# Cursor IDE
15+
.cursor/rules

‎AddChocoApp/Choco.App.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.3.0">
2-
<Name>Install.ps1</Name>
3-
<UnencryptedContentSize>28319</UnencryptedContentSize>
2+
<Name>install.ps1</Name>
3+
<UnencryptedContentSize>1154</UnencryptedContentSize>
44
<FileName>IntunePackage.intunewin</FileName>
5-
<SetupFile>Install.ps1</SetupFile>
5+
<SetupFile>install.ps1</SetupFile>
66
<EncryptionInfo>
7-
<EncryptionKey>bmoyHXFtIws7JrnXNDV4rjzap+Be+4ZJEDJkTfbVIL8=</EncryptionKey>
8-
<MacKey>xNh8ZUZ6TLsAtihUEAU/NHiRfutDzz+eSgEdpaXUo9Q=</MacKey>
9-
<InitializationVector>3aQFPhO8ywEC4Ojby1lR0w==</InitializationVector>
10-
<Mac>PXX+hj3DXEpzMEMYBDXmAIlSyDIGuAwmAHIQpZIt8hU=</Mac>
7+
<EncryptionKey>v8i9okyqxp8xlw3/r2QXMNnXcuGwrBkD54QQ7F/UJbc=</EncryptionKey>
8+
<MacKey>XjT9kWc7gQRKRdEQ/PA/lbQDDH8kFjnuPFILxAldRTI=</MacKey>
9+
<InitializationVector>iyAbM3kIYqA4AlWP89S5oA==</InitializationVector>
10+
<Mac>w+2KMctRWmJzYjKcMTAKCLz15K559SgZ3pnQuQD3P/I=</Mac>
1111
<ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
12-
<FileDigest>fx41h3rGZYZO3Jux7JnPgatlmpMc2ZFIZS8ipF5VDDw=</FileDigest>
12+
<FileDigest>tyjBbJZ+Zj9AqD7UjEfQfe/HojN/q1+zFPidXWbiVuE=</FileDigest>
1313
<FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
1414
</EncryptionInfo>
1515
</ApplicationInfo>

‎AddChocoApp/IntunePackage.intunewin‎

-26.5 KB
Binary file not shown.

‎AddChocoApp/IntunePackage/Install.ps1‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ param (
1212
[string]
1313
$CustomRepo,
1414

15+
[Parameter()]
16+
[string]
17+
$CustomArguments,
18+
1519
[Parameter()]
1620
[switch]
1721
$Trace
@@ -36,13 +40,23 @@ try {
3640
try {
3741
$localprograms = & "$chocoPath" list --localonly
3842
$CustomRepoString = if ($CustomRepo) { "--source $customrepo" } else { $null }
43+
$CustomArgsArray = if ($CustomArguments) { $CustomArguments -split '\s+' } else { @() }
44+
3945
if ($localprograms -like "*$Packagename*" ) {
4046
Write-Host "Upgrading $packagename"
41-
& "$chocoPath" upgrade $Packagename $CustomRepoString
47+
if ($CustomArgsArray.Count -gt 0) {
48+
& "$chocoPath" upgrade $Packagename $CustomRepoString $CustomArgsArray
49+
} else {
50+
& "$chocoPath" upgrade $Packagename $CustomRepoString
51+
}
4252
}
4353
else {
4454
Write-Host "Installing $packagename"
45-
& "$chocoPath" install $Packagename -y $CustomRepoString
55+
if ($CustomArgsArray.Count -gt 0) {
56+
& "$chocoPath" install $Packagename -y $CustomRepoString $CustomArgsArray
57+
} else {
58+
& "$chocoPath" install $Packagename -y $CustomRepoString
59+
}
4660
}
4761
Write-Host 'Completed.'
4862
}

‎AddMSPApp/datto.app.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.3.0">
2-
<Name>install.ps1</Name>
3-
<UnencryptedContentSize>705</UnencryptedContentSize>
4-
<FileName>datto.intunewin</FileName>
5-
<SetupFile>install.ps1</SetupFile>
6-
<EncryptionInfo>
7-
<EncryptionKey>sL/LP/JZ4F4cBSykm6usgJoV1PMoqd62C6JUwuo2z24=</EncryptionKey>
8-
<MacKey>PEpeqeoX7jAWxb0xHGfCkKFxh4/YRfoMTVXrP+uZWzM=</MacKey>
9-
<InitializationVector>ulFPA+vYjaxX0pvq0BMAKQ==</InitializationVector>
10-
<Mac>28ZFU4AT1OznwF8pfqO8i+WFUNSf9024H4Jw2H7UJWs=</Mac>
11-
<ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
12-
<FileDigest>YEb+QNQCko/uZyedA+JfcP/RDm+nZOIjFN04CfhwN4c=</FileDigest>
13-
<FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
14-
</EncryptionInfo>
1+
<ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.3.0">
2+
<Name>install.ps1</Name>
3+
<UnencryptedContentSize>693</UnencryptedContentSize>
4+
<FileName>datto.intunewin</FileName>
5+
<SetupFile>install.ps1</SetupFile>
6+
<EncryptionInfo>
7+
<EncryptionKey>jobB9Ga7J3CbO6acWJyvBRE56nFXwqGfcnGfZRMsJC4=</EncryptionKey>
8+
<MacKey>53SOzs0l6Po2btsGFSMZgkV8vwhH+PxTN8BZDUcfWfg=</MacKey>
9+
<InitializationVector>VjM/osrvPElbu79J+mdXuw==</InitializationVector>
10+
<Mac>UZZXO53Np/tG6Ms+qvwLcNOeD1GRH6NRPFg/TuMz39M=</Mac>
11+
<ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
12+
<FileDigest>KtAWAl29064LG0eyDinbDs0JUbK+EK7GsJovu8obBM4=</FileDigest>
13+
<FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
14+
</EncryptionInfo>
1515
</ApplicationInfo>

‎AddMSPApp/datto.intunewin‎

-16 Bytes
Binary file not shown.

‎CIPP-Permissions.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,11 @@
425425
"Name": "UserAuthenticationMethod.ReadWrite",
426426
"Description": "Allows the app to read and write your authentication methods, including phone numbers and Authenticator app settings.This does not allow the app to see secret information like your passwords, or to sign-in or otherwise use your authentication methods."
427427
},
428+
{
429+
"Id": "424b07a8-1209-4d17-9fe4-9018a93a1024",
430+
"Name": "TeamsTelephoneNumber.ReadWrite.All",
431+
"Description": "Allows the app to read and modify your tenant's acquired telephone number details on behalf of the signed-in admin user. Acquired telephone numbers may include attributes related to assigned object, emergency location, network site, etc."
432+
},
428433
{
429434
"Id": "b7887744-6746-4312-813d-72daeaee7e2d",
430435
"Name": "UserAuthenticationMethod.ReadWrite.All",
@@ -697,6 +702,11 @@
697702
"Name": "User.ReadWrite.All",
698703
"Description": "Allows the app to read and update user profiles without a signed in user."
699704
},
705+
{
706+
"Id": "0a42382f-155c-4eb1-9bdc-21548ccaa387",
707+
"Name": "TeamsTelephoneNumber.ReadWrite.All",
708+
"Description": "Allows the app to read your tenant's acquired telephone number details, without a signed-in user. Acquired telephone numbers may include attributes related to assigned object, emergency location, network site, etc."
709+
},
700710
{
701711
"Id": "50483e42-d915-4231-9639-7fdb7fd190e5",
702712
"Name": "UserAuthenticationMethod.ReadWrite.All",

‎CIPPTimers.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,15 @@
8080
"RunOnProcessor": true,
8181
"PreferredProcessor": "standards"
8282
},
83+
{
84+
"Id": "4d80205c-674d-4fc1-abeb-a1ec37e0d796",
85+
"Command": "Start-DriftStandardsOrchestrator",
86+
"Description": "Orchestrator to process drift standards",
87+
"Cron": "0 0 */1 * * *",
88+
"Priority": 5,
89+
"RunOnProcessor": true,
90+
"PreferredProcessor": "standards"
91+
},
8392
{
8493
"Id": "97145a1d-28f0-4bb2-b929-5a43517d23cc",
8594
"Command": "Start-SchedulerOrchestrator",
@@ -96,6 +105,14 @@
96105
"Priority": 5,
97106
"RunOnProcessor": true
98107
},
108+
{
109+
"Id": "0967c860-3a57-4860-8f33-e5136eae7b4e",
110+
"Command": "Start-TenantDynamicGroupOrchestrator",
111+
"Description": "Orchestrator to update dynamic tenant groups",
112+
"Cron": "0 0 */4 * * *",
113+
"Priority": 6,
114+
"RunOnProcessor": true
115+
},
99116
{
100117
"Id": "4ca242d0-8dc8-4256-b0ed-186599f4233f",
101118
"Command": "Start-UpdateTokensTimer",

0 commit comments

Comments
 (0)