Skip to content

Commit 4cb574e

Browse files
LANCreationLANCreation
authored
Merge branch 'KelvinTegelaar:master' into master
2 parents 684a702 + d019386 commit 4cb574e

File tree

673 files changed

+14517
-9700
lines changed

Some content is hidden

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

673 files changed

+14517
-9700
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
local.settings.json

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ insert_final_newline = true
88

99
[*.{ps1, psd1, psm1}]
1010
indent_size = 4
11-
end_of_line = crlf
11+
end_of_line = lf
1212
trim_trailing_whitespace = true
1313

1414
[*.json]
1515
indent_size = 2
16-
end_of_line = crlf
16+
end_of_line = lf
1717
trim_trailing_whitespace = true
1818

1919
[*.{md, txt}]

‎.gitattributes‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
* text=lf
2+
3+
*.txt text eol=crlf
4+
*.md text eol=crlf
5+
6+
*.ps1 text eol=lf
7+
*.psd1 text eol=lf
8+
*.psm1 text eol=lf
9+
10+
*.json text eol=lf
11+
12+
*.png binary
13+
*.jpg binary

.github/workflows/dev_cippjta72.yml renamed to .github/workflows/dev_api.yml

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
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 - cippjta72
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: 'cippjta72'
28-
slot-name: 'Production'
29-
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_5B44448119C645C099EE192346D7433A }}
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: dev_api
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+
if: github.event.repository.fork == false && github.event_name == 'push'
18+
runs-on: windows-latest
19+
20+
steps:
21+
- name: 'Checkout GitHub Action'
22+
uses: actions/checkout@v4
23+
24+
- name: 'Run Azure Functions Action'
25+
uses: Azure/functions-action@v1
26+
id: fa
27+
with:
28+
app-name: 'cippjta72'
29+
slot-name: 'Production'
30+
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
31+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_5B44448119C645C099EE192346D7433A }}

.github/workflows/dev_cippbcaom.yml renamed to .github/workflows/dev_api_proc.yml

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
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 - cippbcaom
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: 'cippbcaom'
28-
slot-name: 'Production'
29-
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_0FE8CACBBF7D409DAAF132988BECEC4B }}
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: dev_api_proc
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+
if: github.event.repository.fork == false && github.event_name == 'push'
18+
runs-on: windows-latest
19+
20+
steps:
21+
- name: 'Checkout GitHub Action'
22+
uses: actions/checkout@v4
23+
24+
- name: 'Run Azure Functions Action'
25+
uses: Azure/functions-action@v1
26+
id: fa
27+
with:
28+
app-name: 'cippjta72-proc'
29+
slot-name: 'Production'
30+
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
31+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_A53AC5C52A55459DA0A3D8F1716638CB }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ Cache_*
88
Logs
99
ExcludedTenants
1010
SendNotifications/config.json
11+
.env

‎CIPPTimers.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,29 @@
2828
{
2929
"Id": "44a40668-ed71-403c-8c26-b32e320086ad",
3030
"Command": "Start-AuditLogOrchestrator",
31-
"Description": "Orchestrator to process audit logs",
31+
"Description": "Orchestrator to download audit logs",
3232
"Cron": "0 */15 * * * *",
3333
"Priority": 2,
3434
"RunOnProcessor": true,
3535
"PreferredProcessor": "auditlog",
3636
"IsSystem": true
3737
},
38+
{
39+
"Id": "01cd512a-15c4-44a9-b8cb-1e5d879cfd2d",
40+
"Command": "Start-AuditLogProcessingOrchestrator",
41+
"Description": "Orchestrator to process audit logs",
42+
"Cron": "0 */15 * * * *",
43+
"Priority": 3,
44+
"RunOnProcessor": true,
45+
"PreferredProcessor": "auditlog",
46+
"IsSystem": true
47+
},
3848
{
3949
"Id": "03475c86-4314-4d7b-90f2-5a0639e3899b",
4050
"Command": "Start-AuditLogSearchCreation",
4151
"Description": "Timer to create audit log searches",
4252
"Cron": "0 */30 * * * *",
43-
"Priority": 3,
53+
"Priority": 4,
4454
"RunOnProcessor": true,
4555
"PreferredProcessor": "auditlog",
4656
"IsSystem": true

‎CommunityRepos.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
[
2+
{
3+
"Id": "930523724",
4+
"Name": "CIPP-Templates",
5+
"Description": "CIPP Community Templates",
6+
"URL": "https://github.com/CyberDrain/CIPP-Templates",
7+
"FullName": "CyberDrain/CIPP-Templates",
8+
"Owner": "CyberDrain",
9+
"Visibility": "public",
10+
"WriteAccess": false,
11+
"DefaultBranch": "main",
12+
"RepoPermissions": {
13+
"admin": false,
14+
"maintain": false,
15+
"push": false,
16+
"triage": false,
17+
"pull": true
18+
}
19+
},
20+
{
21+
"Id": "784230225",
22+
"Name": "ConditionalAccessBaseline",
23+
"Description": "",
24+
"URL": "https://github.com/j0eyv/ConditionalAccessBaseline",
25+
"FullName": "j0eyv/ConditionalAccessBaseline",
26+
"Owner": "j0eyv",
27+
"Visibility": "public",
28+
"WriteAccess": false,
29+
"DefaultBranch": "main",
30+
"RepoPermissions": {
31+
"admin": false,
32+
"maintain": false,
33+
"push": false,
34+
"triage": false,
35+
"pull": true
36+
}
37+
},
38+
{
39+
"Id": "493403016",
40+
"Name": "OpenIntuneBaseline",
41+
"Description": "Community-driven baseline to accelerate Intune adoption and learning.",
42+
"URL": "https://github.com/SkipToTheEndpoint/OpenIntuneBaseline",
43+
"FullName": "SkipToTheEndpoint/OpenIntuneBaseline",
44+
"Owner": "SkipToTheEndpoint",
45+
"Visibility": "public",
46+
"WriteAccess": false,
47+
"DefaultBranch": "main",
48+
"RepoPermissions": {
49+
"admin": false,
50+
"maintain": false,
51+
"push": false,
52+
"triage": false,
53+
"pull": true
54+
}
55+
}
56+
]

‎Config/CyberEssentials.BPATemplate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"StoreAs": "JSON",
5555
"API": "Graph",
5656
"ExtractFields": ["windowsProtectionState"],
57-
"parameters": {},
57+
"Parameters": {},
5858
"URL": "https://graph.microsoft.com/beta/deviceManagement/managedDevices?$expand=windowsProtectionState"
5959
},
6060
{

0 commit comments

Comments
 (0)