From 5114c134806b7d842de1b139280098f6f50efcb3 Mon Sep 17 00:00:00 2001 From: ShocOne <62835948+ShocOne@users.noreply.github.com> Date: Mon, 25 Mar 2024 15:20:44 +0000 Subject: [PATCH] Refactor Jamf Pro configuration profiles, packages, and scripts --- .../jamfpro/macosconfigurationprofiles.tf | 36 ++++++------- workload/terraform/jamfpro/packages.tf | 50 +++++++++---------- workload/terraform/jamfpro/scripts.tf | 36 ++++++------- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/workload/terraform/jamfpro/macosconfigurationprofiles.tf b/workload/terraform/jamfpro/macosconfigurationprofiles.tf index 636c9ddc..fbcaaa16 100644 --- a/workload/terraform/jamfpro/macosconfigurationprofiles.tf +++ b/workload/terraform/jamfpro/macosconfigurationprofiles.tf @@ -1,20 +1,20 @@ -# resource "jamfpro_macos_configuration_profile" "jamfpro_macos_configuration_profile_001" { -# name = "tf-ghatest-macosconfigprofile-accessibility-options" -# distribution_method = "Install Automatically" -# payload = file("${path.module}/support_files/configuration_profiles/accessibility-chara-nosub-test.mobileconfig") -# category { -# id = -1 -# } -# scope { -# all_computers = false -# computer_ids = sort([17, 18]) -# computer_group_ids = sort([53]) -# jss_user_ids = [4] -# jss_user_group_ids = [4] +resource "jamfpro_macos_configuration_profile" "jamfpro_macos_configuration_profile_001" { + name = "tf-ghatest-macosconfigprofile-accessibility-options" + distribution_method = "Install Automatically" + payload = file("${path.module}/support_files/configuration_profiles/accessibility-chara-nosub-test.mobileconfig") + category { + id = -1 + } + scope { + all_computers = false + computer_ids = sort([17, 18]) + computer_group_ids = sort([53]) + jss_user_ids = [4] + jss_user_group_ids = [4] -# exclusions { -# department_ids = [27653] -# } -# } -# } \ No newline at end of file + exclusions { + department_ids = [27653] + } + } +} \ No newline at end of file diff --git a/workload/terraform/jamfpro/packages.tf b/workload/terraform/jamfpro/packages.tf index cdb0b591..585f73d9 100644 --- a/workload/terraform/jamfpro/packages.tf +++ b/workload/terraform/jamfpro/packages.tf @@ -2,31 +2,31 @@ // Define a Jamf Pro Package Resource -# resource "jamfpro_package" "jamfpro_package_001" { -# name = "tf-ghatest-package-suspiciouspackage" -# package_file_path = "support_files/packages/SuspiciousPackage.dmg" -# category = "Unknown" -# info = "tf package deployment for demonstration" -# notes = "This package is used for Terraform provider documentation example." -# priority = 10 -# reboot_required = false -# fill_user_template = true -# fill_existing_users = true -# boot_volume_required = false -# allow_uninstalled = false -# os_requirements = "macOS 10.15.1, macOS 10.15.7" -# install_if_reported_available = false -# send_notification = true -# } +resource "jamfpro_package" "jamfpro_package_001" { + name = "tf-ghatest-package-suspiciouspackage" + package_file_path = "support_files/packages/SuspiciousPackage.dmg" + category = "Unknown" + info = "tf package deployment for demonstration" + notes = "This package is used for Terraform provider documentation example." + priority = 10 + reboot_required = false + fill_user_template = true + fill_existing_users = true + boot_volume_required = false + allow_uninstalled = false + os_requirements = "macOS 10.15.1, macOS 10.15.7" + install_if_reported_available = false + send_notification = true +} -# data "jamfpro_package" "jamfpro_package_001_data" { -# id = jamfpro_package.jamfpro_package_001.id -# } +data "jamfpro_package" "jamfpro_package_001_data" { + id = jamfpro_package.jamfpro_package_001.id +} -# output "jamfpro_package_001_data_id" { -# value = data.jamfpro_package.jamfpro_package_001_data.id -# } +output "jamfpro_package_001_data_id" { + value = data.jamfpro_package.jamfpro_package_001_data.id +} -# output "jamfpro_package_001_data_name" { -# value = data.jamfpro_package.jamfpro_package_001_data.name -# } \ No newline at end of file +output "jamfpro_package_001_data_name" { + value = data.jamfpro_package.jamfpro_package_001_data.name +} \ No newline at end of file diff --git a/workload/terraform/jamfpro/scripts.tf b/workload/terraform/jamfpro/scripts.tf index e14ba237..4cc73fd7 100644 --- a/workload/terraform/jamfpro/scripts.tf +++ b/workload/terraform/jamfpro/scripts.tf @@ -1,24 +1,24 @@ -# resource "jamfpro_script" "jamfpro_script_001" { -# name = "tf-ghatest-correct-application-permissions-v1.0" -# script_contents = file("${path.module}/support_files/scripts/Correct Application Permissions.sh") -# os_requirements = "13" -# priority = "BEFORE" -# info = "Adds target user or group to specified group membership, or removes said membership." -# notes = "Jamf Pro script parameters: 4 -> 7" -# parameter4 = "Google Chrome" // targetApplication -# } +resource "jamfpro_script" "jamfpro_script_001" { + name = "tf-ghatest-correct-application-permissions-v1.0" + script_contents = file("${path.module}/support_files/scripts/Correct Application Permissions.sh") + os_requirements = "13" + priority = "BEFORE" + info = "Adds target user or group to specified group membership, or removes said membership." + notes = "Jamf Pro script parameters: 4 -> 7" + parameter4 = "Google Chrome" // targetApplication +} -# data "jamfpro_script" "jamfpro_script_001_data" { -# id = jamfpro_script.jamfpro_script_001.id -# } +data "jamfpro_script" "jamfpro_script_001_data" { + id = jamfpro_script.jamfpro_script_001.id +} -# output "jamfpro_script_001_data_id" { -# value = data.jamfpro_script.jamfpro_script_001_data.id -# } +output "jamfpro_script_001_data_id" { + value = data.jamfpro_script.jamfpro_script_001_data.id +} -# output "jamfpro_script_001_data_name" { -# value = data.jamfpro_script.jamfpro_script_001_data.name -# } +output "jamfpro_script_001_data_name" { + value = data.jamfpro_script.jamfpro_script_001_data.name +} # resource "jamfpro_script" "jamfpro_script_002" { # name = "tf-ghatest-encrypt-apfs-volume-v5.0.1"