Skip to content

Add pref for aggressive_update_notification_days #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ munki::munkitools_core_source: ''
munki::munkitools_core_version: ''
munki::munkitools_receipt: ''
munki::munkitools_source: ''
munki::munkitools_source: ''
munki::munkitools_launchd_checksum: ''
munki::munkitools_launchd_receipt: ''
munki::munkitools_launchd_source: ''
Expand All @@ -57,4 +56,5 @@ munki::munkitools_python_version: ''
munki::http_user: ''
munki::http_password: ''
munki::munki_python: true
munki::manage_profile: true
munki::manage_profile: true
munki::aggressive_update_notification_days: 14
2 changes: 2 additions & 0 deletions manifests/config.pp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Configure munki via dynamic profile
class munki::config {
$aggressive_update_notification_days = $munki::aggressive_update_notification_days
$apple_software_updates_only = $munki::apple_software_updates_only
$client_cert_path = $munki::client_cert_path
$client_identifier = $munki::client_identifier
Expand Down Expand Up @@ -28,6 +29,7 @@

$mcx_settings = {
'AdditionalHttpHeaders' => $additional_http_headers,
'AggressiveUpdateNotificationDays' => $aggressive_update_notification_days,
'AppleSoftwareUpdatesOnly' => $apple_software_updates_only,
'ClientIdentifier' => $client_identifier,
'DaysBetweenNotifications' => $days_between_notifications,
Expand All @@ -50,7 +52,7 @@
$managed_uninstalls = lookup('munki::managed_uninstalls', Array, 'unique', [])

if $use_client_cert == true {
$cert_settings = {'ClientCertificatePath' => $client_cert_path, 'ClientKeyPath' => $client_key_path, 'SoftwareRepoCACertificate' => $software_repo_ca_cert}

Check warning on line 55 in manifests/config.pp

View workflow job for this annotation

GitHub Actions / test

line has more than 140 characters (check: 140chars)
$settings_with_cert = merge($mcx_settings, $cert_settings)
} else {
$settings_with_cert = $mcx_settings
Expand Down
1 change: 1 addition & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Installs and configures munki
# you must specify your own munki repo URL; please don't use http://munki and instead use a https URL.

class munki (

Check warning on line 6 in manifests/init.pp

View workflow job for this annotation

GitHub Actions / test

class not documented (check: documentation)
Boolean $apple_software_updates_only,
String $client_cert_path,
String $client_identifier,
Expand Down Expand Up @@ -62,6 +62,7 @@
String $http_password,
Boolean $munki_python,
Boolean $manage_profile,
Integer $aggressive_update_notification_days,
)
{
class { '::munki::config': }
Expand Down
Loading