Skip to content

Commit dc4b4ff

Browse files
authored
Merge pull request KelvinTegelaar#1055 from KelvinTegelaar/dev
Dev to hotfix
2 parents c754b0a + 02dccbc commit dc4b4ff

28 files changed

Lines changed: 106 additions & 224 deletions
Lines changed: 3 additions & 3 deletions
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 - 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: 'cippz6s4d'
27+
app-name: 'cipp4i6t3'
2828
slot-name: 'Production'
2929
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_D27E7CF0887F4E4591F3957CCA96F0FD }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_9D257A31ACA24925A112AF5FFC2BEAFE }}

.github/workflows/dev_cipphfjdq.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 6 additions & 6 deletions
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 - cippacnqv
4+
name: Build and deploy Powershell project to Azure Function App - cippkwn4s
55

66
on:
77
push:
@@ -23,17 +23,17 @@ jobs:
2323
uses: actions/checkout@v4
2424

2525
- name: Login to Azure
26-
uses: azure/login@v1
26+
uses: azure/login@v2
2727
with:
28-
client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_6085081ED1124B799258E9FF743FF4B9 }}
29-
tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_9BDB2DDBFAFA4BC19C20A58B204BFAF3 }}
30-
subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_02B5224812794971B05EDD557AF2B867 }}
28+
client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_B6BCC8886F40482FB8B43907FCDA6596 }}
29+
tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_0D1C65B9099F48FABDF7F7052EA6887F }}
30+
subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_76518AE5ECB34375A414DEEE1119C161 }}
3131

3232
- name: 'Run Azure Functions Action'
3333
uses: Azure/functions-action@v1
3434
id: fa
3535
with:
36-
app-name: 'cippacnqv'
36+
app-name: 'cippkwn4s'
3737
slot-name: 'Production'
3838
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
3939

Lines changed: 3 additions & 3 deletions
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 - cipplwwww
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: 'cipplwwww'
2828
slot-name: 'Production'
2929
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_726578DA8A7243BF9D82FE123C2F6E7F }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_00A9A6DFE9244C2EA8952190FFF10F45 }}

.github/workflows/dev_cippopy3o.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/dev_cipppwrro.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/ninjaone_cipp426ns.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

Config/standards.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2235,7 +2235,7 @@
22352235
"value": "none"
22362236
},
22372237
{
2238-
"label": "Restirct sharing to specific domains",
2238+
"label": "Restrict sharing to specific domains",
22392239
"value": "allowList"
22402240
},
22412241
{

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ExecStandardsRun.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Function Invoke-ExecStandardsRun {
1313
Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
1414
$tenantfilter = if ($Request.Query.TenantFilter) { $Request.Query.TenantFilter } else { 'allTenants' }
1515
try {
16-
$null = Invoke-CIPPStandardsRun -Tenantfilter $tenantfilter
16+
$null = Invoke-CIPPStandardsRun -Tenantfilter $tenantfilter -Force
1717
$Results = "Successfully Started Standards Run for Tenant $tenantfilter"
1818
} catch {
1919
$Results = "Failed to start standards run for $tenantfilter. Error: $($_.Exception.Message)"

Modules/CIPPCore/Public/Entrypoints/Invoke-PublicPhishingCheck.ps1

Lines changed: 6 additions & 29 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)