Merge branch 'KelvinTegelaar:master' into master

SynergiTech · Jan 2, 2024 · bf5856e · bf5856e
2 parents 6445455 + 17eab37
commit bf5856e
Show file tree

Hide file tree

Showing 990 changed files with 21,555 additions and 18,953 deletions.
diff --git a/.github/workflows/ninjaone_cipp426ns.yml b/.github/workflows/ninjaone_cipp426ns.yml
@@ -0,0 +1,29 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cipp426ns
+
+on:
+  push:
+    branches:
+      - NinjaOne
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  build-and-deploy:
+    runs-on: windows-latest
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v2
+
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cipp426ns'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_198DAF92160A4302B5AA0C145DE72796 }}
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,4 @@ chocoapps.cache
 Cache_*
 Logs
 ExcludedTenants
-Config
 SendNotifications/config.json
diff --git a/AddAPDevice/function.json b/AddAPDevice/function.json
diff --git a/AddAPDevice/run.ps1 b/AddAPDevice/run.ps1
diff --git a/AddAlert/function.json b/AddAlert/function.json
diff --git a/AddAlert/run.ps1 b/AddAlert/run.ps1
diff --git a/AddAutopilotConfig/function.json b/AddAutopilotConfig/function.json
diff --git a/AddAutopilotConfig/run.ps1 b/AddAutopilotConfig/run.ps1
diff --git a/AddCAPolicy/function.json b/AddCAPolicy/function.json
diff --git a/AddCAPolicy/run.ps1 b/AddCAPolicy/run.ps1
diff --git a/AddCATemplate/function.json b/AddCATemplate/function.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,5 +7,4 @@ chocoapps.cache @@
     Cache_*
     Logs
     ExcludedTenants
-    Config
     SendNotifications/config.json