From 1b6c143af7655c3c75cc5b7dafe404a77d441776 Mon Sep 17 00:00:00 2001 From: Ryan Curran Date: Fri, 20 Feb 2026 13:24:02 -0500 Subject: [PATCH 1/2] puppet module power --- .../macos_power_management/manifests/init.pp | 35 +++++++++++++++++++ .../manifests/profiles/power_management.pp | 2 +- .../roles/enterprise_1_b_osx_arm64.pp | 1 + .../roles/enterprise_3_b_osx_arm64.pp | 1 + .../manifests/roles/gecko_1_b_osx_1015.pp | 1 + .../roles/gecko_1_b_osx_1015_staging.pp | 1 + .../manifests/roles/gecko_1_b_osx_arm64.pp | 1 + .../manifests/roles/gecko_3_b_osx_1015.pp | 1 + .../manifests/roles/gecko_3_b_osx_arm64.pp | 1 + .../manifests/roles/gecko_t_osx_1015_r8.pp | 1 + .../roles/gecko_t_osx_1015_r8_staging.pp | 1 + .../manifests/roles/gecko_t_osx_1400_r8.pp | 1 + .../roles/gecko_t_osx_1400_r8_staging.pp | 1 + .../manifests/roles/gecko_t_osx_1500_m4.pp | 1 + .../roles/gecko_t_osx_1500_m4_ipv6.pp | 1 + .../roles/gecko_t_osx_1500_m4_staging.pp | 1 + .../manifests/roles/gecko_t_osx_1500_m_vms.pp | 1 + .../manifests/roles/nss_1_b_osx_1015.pp | 1 + .../manifests/roles/nss_3_b_osx_1015.pp | 1 + 19 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 modules/macos_power_management/manifests/init.pp diff --git a/modules/macos_power_management/manifests/init.pp b/modules/macos_power_management/manifests/init.pp new file mode 100644 index 000000000..5f4c708a8 --- /dev/null +++ b/modules/macos_power_management/manifests/init.pp @@ -0,0 +1,35 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +class macos_power_management { + exec { 'pmset_sleep': + command => '/usr/bin/pmset -a sleep 0', + unless => '/usr/bin/pmset -g | /usr/bin/grep -w sleep | /usr/bin/grep -w 0', + } + + exec { 'pmset_displaysleep': + command => '/usr/bin/pmset -a displaysleep 0', + unless => '/usr/bin/pmset -g | /usr/bin/grep -w displaysleep | /usr/bin/grep -w 0', + } + + exec { 'pmset_disksleep': + command => '/usr/bin/pmset -a disksleep 0', + unless => '/usr/bin/pmset -g | /usr/bin/grep -w disksleep | /usr/bin/grep -w 0', + } + + exec { 'pmset_womp': + command => '/usr/bin/pmset -a womp 1', + unless => '/usr/bin/pmset -g | /usr/bin/grep -w womp | /usr/bin/grep -w 1', + } + + exec { 'pmset_autorestart': + command => '/usr/bin/pmset -a autorestart 1', + unless => '/usr/bin/pmset -g | /usr/bin/grep -w autorestart | /usr/bin/grep -w 1', + } + + exec { 'pmset_SleepDisabled': + command => '/usr/bin/pmset -a SleepDisabled 1', + unless => '/usr/bin/pmset -g | /usr/bin/grep -w SleepDisabled | /usr/bin/grep -w 1', + } +} diff --git a/modules/roles_profiles/manifests/profiles/power_management.pp b/modules/roles_profiles/manifests/profiles/power_management.pp index c4c9e695b..56ec97409 100644 --- a/modules/roles_profiles/manifests/profiles/power_management.pp +++ b/modules/roles_profiles/manifests/profiles/power_management.pp @@ -5,7 +5,7 @@ class roles_profiles::profiles::power_management { case $facts['os']['name'] { 'Darwin': { - include macos_mobileconfig_profiles::power_management + include macos_power_management } 'Windows': { case $facts['custom_win_location'] { diff --git a/modules/roles_profiles/manifests/roles/enterprise_1_b_osx_arm64.pp b/modules/roles_profiles/manifests/roles/enterprise_1_b_osx_arm64.pp index 57dd28258..7953a940b 100644 --- a/modules/roles_profiles/manifests/roles/enterprise_1_b_osx_arm64.pp +++ b/modules/roles_profiles/manifests/roles/enterprise_1_b_osx_arm64.pp @@ -12,6 +12,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::sudo include roles_profiles::profiles::timezone diff --git a/modules/roles_profiles/manifests/roles/enterprise_3_b_osx_arm64.pp b/modules/roles_profiles/manifests/roles/enterprise_3_b_osx_arm64.pp index d5bfa682d..91678bbcd 100644 --- a/modules/roles_profiles/manifests/roles/enterprise_3_b_osx_arm64.pp +++ b/modules/roles_profiles/manifests/roles/enterprise_3_b_osx_arm64.pp @@ -12,6 +12,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::sudo include roles_profiles::profiles::timezone diff --git a/modules/roles_profiles/manifests/roles/gecko_1_b_osx_1015.pp b/modules/roles_profiles/manifests/roles/gecko_1_b_osx_1015.pp index f6fa57b6b..f096ec17b 100644 --- a/modules/roles_profiles/manifests/roles/gecko_1_b_osx_1015.pp +++ b/modules/roles_profiles/manifests/roles/gecko_1_b_osx_1015.pp @@ -12,6 +12,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::sudo include roles_profiles::profiles::timezone diff --git a/modules/roles_profiles/manifests/roles/gecko_1_b_osx_1015_staging.pp b/modules/roles_profiles/manifests/roles/gecko_1_b_osx_1015_staging.pp index 134d42e3c..e4ded3ac4 100644 --- a/modules/roles_profiles/manifests/roles/gecko_1_b_osx_1015_staging.pp +++ b/modules/roles_profiles/manifests/roles/gecko_1_b_osx_1015_staging.pp @@ -11,6 +11,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::sudo include roles_profiles::profiles::timezone diff --git a/modules/roles_profiles/manifests/roles/gecko_1_b_osx_arm64.pp b/modules/roles_profiles/manifests/roles/gecko_1_b_osx_arm64.pp index 6a62542a4..ac8a4f555 100644 --- a/modules/roles_profiles/manifests/roles/gecko_1_b_osx_arm64.pp +++ b/modules/roles_profiles/manifests/roles/gecko_1_b_osx_arm64.pp @@ -12,6 +12,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::sudo include roles_profiles::profiles::timezone diff --git a/modules/roles_profiles/manifests/roles/gecko_3_b_osx_1015.pp b/modules/roles_profiles/manifests/roles/gecko_3_b_osx_1015.pp index e9ebcc12c..b0783f863 100644 --- a/modules/roles_profiles/manifests/roles/gecko_3_b_osx_1015.pp +++ b/modules/roles_profiles/manifests/roles/gecko_3_b_osx_1015.pp @@ -11,6 +11,7 @@ include roles_profiles::profiles::network include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::sudo include roles_profiles::profiles::timezone diff --git a/modules/roles_profiles/manifests/roles/gecko_3_b_osx_arm64.pp b/modules/roles_profiles/manifests/roles/gecko_3_b_osx_arm64.pp index 9374c4254..6db845b4c 100644 --- a/modules/roles_profiles/manifests/roles/gecko_3_b_osx_arm64.pp +++ b/modules/roles_profiles/manifests/roles/gecko_3_b_osx_arm64.pp @@ -12,6 +12,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::sudo include roles_profiles::profiles::timezone diff --git a/modules/roles_profiles/manifests/roles/gecko_t_osx_1015_r8.pp b/modules/roles_profiles/manifests/roles/gecko_t_osx_1015_r8.pp index cb8c397cf..807998c98 100644 --- a/modules/roles_profiles/manifests/roles/gecko_t_osx_1015_r8.pp +++ b/modules/roles_profiles/manifests/roles/gecko_t_osx_1015_r8.pp @@ -17,6 +17,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::safaridriver include roles_profiles::profiles::safariupdate diff --git a/modules/roles_profiles/manifests/roles/gecko_t_osx_1015_r8_staging.pp b/modules/roles_profiles/manifests/roles/gecko_t_osx_1015_r8_staging.pp index 9d6a6c3dc..73947afc9 100644 --- a/modules/roles_profiles/manifests/roles/gecko_t_osx_1015_r8_staging.pp +++ b/modules/roles_profiles/manifests/roles/gecko_t_osx_1015_r8_staging.pp @@ -18,6 +18,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::safaridriver include roles_profiles::profiles::safariupdate diff --git a/modules/roles_profiles/manifests/roles/gecko_t_osx_1400_r8.pp b/modules/roles_profiles/manifests/roles/gecko_t_osx_1400_r8.pp index 8daf7bfed..50ecf4da8 100644 --- a/modules/roles_profiles/manifests/roles/gecko_t_osx_1400_r8.pp +++ b/modules/roles_profiles/manifests/roles/gecko_t_osx_1400_r8.pp @@ -20,6 +20,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::safaridriver include roles_profiles::profiles::sudo diff --git a/modules/roles_profiles/manifests/roles/gecko_t_osx_1400_r8_staging.pp b/modules/roles_profiles/manifests/roles/gecko_t_osx_1400_r8_staging.pp index a18ab73b5..4ffcda5f1 100644 --- a/modules/roles_profiles/manifests/roles/gecko_t_osx_1400_r8_staging.pp +++ b/modules/roles_profiles/manifests/roles/gecko_t_osx_1400_r8_staging.pp @@ -21,6 +21,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::safaridriver include roles_profiles::profiles::sudo diff --git a/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4.pp b/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4.pp index 91aa37a6c..a8a7a966a 100644 --- a/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4.pp +++ b/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4.pp @@ -19,6 +19,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::safaridriver include roles_profiles::profiles::sudo diff --git a/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4_ipv6.pp b/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4_ipv6.pp index 663755876..bc4b6050c 100644 --- a/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4_ipv6.pp +++ b/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4_ipv6.pp @@ -17,6 +17,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::safaridriver include roles_profiles::profiles::sudo diff --git a/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4_staging.pp b/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4_staging.pp index c2bcbbf51..483a2524f 100644 --- a/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4_staging.pp +++ b/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m4_staging.pp @@ -19,6 +19,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::safaridriver include roles_profiles::profiles::sudo diff --git a/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m_vms.pp b/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m_vms.pp index acfdcd28e..de8431d40 100644 --- a/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m_vms.pp +++ b/modules/roles_profiles/manifests/roles/gecko_t_osx_1500_m_vms.pp @@ -13,6 +13,7 @@ include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed include roles_profiles::profiles::pipconf + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::safaridriver include roles_profiles::profiles::sudo diff --git a/modules/roles_profiles/manifests/roles/nss_1_b_osx_1015.pp b/modules/roles_profiles/manifests/roles/nss_1_b_osx_1015.pp index 533c11237..f8ea1ab69 100644 --- a/modules/roles_profiles/manifests/roles/nss_1_b_osx_1015.pp +++ b/modules/roles_profiles/manifests/roles/nss_1_b_osx_1015.pp @@ -11,6 +11,7 @@ include roles_profiles::profiles::network include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::sudo include roles_profiles::profiles::timezone diff --git a/modules/roles_profiles/manifests/roles/nss_3_b_osx_1015.pp b/modules/roles_profiles/manifests/roles/nss_3_b_osx_1015.pp index ffd4723e8..9091fdc64 100644 --- a/modules/roles_profiles/manifests/roles/nss_3_b_osx_1015.pp +++ b/modules/roles_profiles/manifests/roles/nss_3_b_osx_1015.pp @@ -11,6 +11,7 @@ include roles_profiles::profiles::network include roles_profiles::profiles::ntp include roles_profiles::profiles::packages_installed + include roles_profiles::profiles::power_management include roles_profiles::profiles::relops_users include roles_profiles::profiles::sudo include roles_profiles::profiles::timezone From 96ac3bffa74619ff833eeea92051ffad3f2faf12 Mon Sep 17 00:00:00 2001 From: Ryan Curran Date: Fri, 20 Feb 2026 15:44:54 -0500 Subject: [PATCH 2/2] fix --- modules/macos_power_management/manifests/init.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/macos_power_management/manifests/init.pp b/modules/macos_power_management/manifests/init.pp index 5f4c708a8..3f25b1dee 100644 --- a/modules/macos_power_management/manifests/init.pp +++ b/modules/macos_power_management/manifests/init.pp @@ -31,5 +31,6 @@ exec { 'pmset_SleepDisabled': command => '/usr/bin/pmset -a SleepDisabled 1', unless => '/usr/bin/pmset -g | /usr/bin/grep -w SleepDisabled | /usr/bin/grep -w 1', + returns => [0, 1], } }