Skip to content

Commit d94a3af

Browse files
authored
Merge branch 'KelvinTegelaar:master' into master
2 parents ad78747 + 720ce15 commit d94a3af

File tree

755 files changed

+344575
-7556
lines changed

Some content is hidden

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

755 files changed

+344575
-7556
lines changed

.github/workflows/dev_cippckdtz.yml .github/workflows/dev_cipp4i6t3.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
22
# More GitHub Actions for Azure: https://github.com/Azure/actions
33

4-
name: Build and deploy Powershell project to Azure Function App - cippckdtz
4+
name: Build and deploy Powershell project to Azure Function App - cipp4i6t3
55

66
on:
77
push:
@@ -24,7 +24,7 @@ jobs:
2424
uses: Azure/functions-action@v1
2525
id: fa
2626
with:
27-
app-name: 'cippckdtz'
27+
app-name: 'cipp4i6t3'
2828
slot-name: 'Production'
2929
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_726578DA8A7243BF9D82FE123C2F6E7F }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_9D257A31ACA24925A112AF5FFC2BEAFE }}

.github/workflows/dev_cippz6s4d.yml .github/workflows/dev_cippkkxvm.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
22
# More GitHub Actions for Azure: https://github.com/Azure/actions
33

4-
name: Build and deploy Powershell project to Azure Function App - cippz6s4d
4+
name: Build and deploy Powershell project to Azure Function App - cippkkxvm
55

66
on:
77
push:
@@ -24,7 +24,7 @@ jobs:
2424
uses: Azure/functions-action@v1
2525
id: fa
2626
with:
27-
app-name: 'cippz6s4d'
27+
app-name: 'cippkkxvm'
2828
slot-name: 'Production'
2929
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_D27E7CF0887F4E4591F3957CCA96F0FD }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_171C3E2B1E2346AAA333905DFCA62F2D }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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 - cippkwn4s-auditlog
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: windows-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: 'cippkwn4s-auditlog'
28+
slot-name: 'Production'
29+
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_4CBFBE8BE62240D789C371767B49278E }}

.github/workflows/dev_cippkwn4s.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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 - cippkwn4s
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: windows-latest
18+
permissions:
19+
id-token: write #This is required for requesting the JWT
20+
21+
steps:
22+
- name: 'Checkout GitHub Action'
23+
uses: actions/checkout@v4
24+
25+
- name: Login to Azure
26+
uses: azure/login@v2
27+
with:
28+
client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_B6BCC8886F40482FB8B43907FCDA6596 }}
29+
tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_0D1C65B9099F48FABDF7F7052EA6887F }}
30+
subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_76518AE5ECB34375A414DEEE1119C161 }}
31+
32+
- name: 'Run Azure Functions Action'
33+
uses: Azure/functions-action@v1
34+
id: fa
35+
with:
36+
app-name: 'cippkwn4s'
37+
slot-name: 'Production'
38+
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
39+
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
22
# More GitHub Actions for Azure: https://github.com/Azure/actions
33

4-
name: Build and deploy Powershell project to Azure Function App - cipp426ns
4+
name: Build and deploy Powershell project to Azure Function App - cipplwwww-proc
55

66
on:
77
push:
88
branches:
9-
- NinjaOne
9+
- dev
1010
workflow_dispatch:
1111

1212
env:
1313
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
1414

1515
jobs:
16-
build-and-deploy:
16+
deploy:
1717
runs-on: windows-latest
18+
1819
steps:
1920
- name: 'Checkout GitHub Action'
20-
uses: actions/checkout@v2
21-
21+
uses: actions/checkout@v4
22+
2223
- name: 'Run Azure Functions Action'
2324
uses: Azure/functions-action@v1
2425
id: fa
2526
with:
26-
app-name: 'cipp426ns'
27+
app-name: 'cipplwwww-proc'
2728
slot-name: 'Production'
2829
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
29-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_198DAF92160A4302B5AA0C145DE72796 }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_B8CE64E970E74E6AB2D6655823D95B1A }}
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
22
# More GitHub Actions for Azure: https://github.com/Azure/actions
33

4-
name: Build and deploy Powershell project to Azure Function App - cipppwrro
4+
name: Build and deploy Powershell project to Azure Function App - cipplwwww
55

66
on:
77
push:
@@ -13,17 +13,18 @@ env:
1313
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
1414

1515
jobs:
16-
build-and-deploy:
16+
deploy:
1717
runs-on: windows-latest
18+
1819
steps:
1920
- name: 'Checkout GitHub Action'
20-
uses: actions/checkout@v2
21-
21+
uses: actions/checkout@v4
22+
2223
- name: 'Run Azure Functions Action'
2324
uses: Azure/functions-action@v1
2425
id: fa
2526
with:
26-
app-name: 'cipppwrro'
27+
app-name: 'cipplwwww'
2728
slot-name: 'Production'
2829
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
29-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_9E109464904540339CA94F283ACE1312 }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_00A9A6DFE9244C2EA8952190FFF10F45 }}

.vscode/extensions.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": [
3+
"editorconfig.editorconfig"
4+
]
5+
}

Activity_AddOrUpdateTableRows/function.json

-9
This file was deleted.

Activity_AddOrUpdateTableRows/run.ps1

-12
This file was deleted.

Activity_GetAllTableRows/function.json

-9
This file was deleted.

Activity_GetAllTableRows/run.ps1

-6
This file was deleted.

AddAlertSubscription_Queue/function.json

-12
This file was deleted.

AddChocoApp_OrchestrationStarter/function.json

-24
This file was deleted.

AddChocoApp_OrchestrationStarter/run.ps1

-21
This file was deleted.

AddChocoApp_OrchestrationStarterTimer/function.json

-15
This file was deleted.

AddChocoApp_OrchestrationStarterTimer/run.ps1

-19
This file was deleted.

AddMSPApp/Immybot.app.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"owner": " ",
88
"informationUrl": " ",
99
"privacyInformationUrl": " ",
10-
"fileName": "ninjarmm.intunewin",
10+
"fileName": "immybot.intunewin",
1111
"@odata.type": "#microsoft.graph.win32LobApp",
1212
"applicableArchitectures": "x86, x64",
1313

@@ -19,7 +19,7 @@
1919
"detectionRules": [
2020
{
2121
"@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
22-
"path": "%ProgramData%\\Immyboy\\Bin",
22+
"path": "%ProgramData%\\Immybot\\Bin",
2323
"fileOrFolderName": "Immybot.exe",
2424
"check32BitOn64System": false,
2525
"detectionType": "exists"

AddMSPApp/ninjarmm.app.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"detectionRules": [
2020
{
2121
"@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
22-
"path": "%ProgramData%\\Syncro\\Bin",
23-
"fileOrFolderName": "Syncro.Overmind.Service.exe",
22+
"path": "%ProgramData%\\NinjaRMMAgent",
23+
"fileOrFolderName": "ninjarmm-cli.exe",
2424
"check32BitOn64System": false,
2525
"detectionType": "exists"
2626
}

Applications_GetQueue/function.json

-9
This file was deleted.

Applications_GetQueue/run.ps1

-6
This file was deleted.

Applications_Orchestrator/function.json

-9
This file was deleted.

0 commit comments

Comments
 (0)