Skip to content
Open
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
40 changes: 40 additions & 0 deletions modules/macos_disable_screensaver/manifests/init.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# 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/.

# Disables the macOS screen saver and removes the password-after-screensaver
# requirement by writing to the system-level com.apple.screensaver preferences
# domain as root. Writing to /Library/Preferences sets a system-wide default
# that applies to all users, replacing the MDM/mobileconfig profile approach.
# Works on macOS 10.15 and later.
class macos_disable_screensaver {
$domain = '/Library/Preferences/com.apple.screensaver'

macos_utils::defaults { 'screensaver_idleTime':
domain => $domain,
key => 'idleTime',
value => '0',
val_type => 'int',
}

macos_utils::defaults { 'screensaver_loginWindowIdleTime':
domain => $domain,
key => 'loginWindowIdleTime',
value => '0',
val_type => 'int',
}

macos_utils::defaults { 'screensaver_askForPassword':
domain => $domain,
key => 'askForPassword',
value => '0',
val_type => 'bool',
}

macos_utils::defaults { 'screensaver_askForPasswordDelay':
domain => $domain,
key => 'askForPasswordDelay',
value => '0',
val_type => 'int',
}
}
41 changes: 26 additions & 15 deletions modules/macos_utils/manifests/defaults.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,33 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

define macos_utils::defaults (
Optional[String] $domain = undef,
Optional[String] $key = undef,
Optional[String] $value = undef,
String $user = 'root',
Enum['string', 'int', 'float', 'bool', 'date', 'array'] $val_type = 'string',
Optional[String] $domain = undef,
Optional[String] $key = undef,
Optional[String] $value = undef,
String $user = 'root',
Enum['string', 'int', 'float', 'bool', 'date', 'array'] $val_type = 'string',
) {

$defaults_cmd = '/usr/bin/defaults'
if ($domain != undef) and ($key != undef) and ($value != undef) {
exec { "osx_defaults write ${domain} ${key}=>${value}" :
command => "${defaults_cmd} write ${domain} ${key} -${val_type} ${value}",
unless => "/bin/test x`${defaults_cmd} read ${domain} ${key}` = x'${value}'",
user => $user,
}
$defaults_cmd = '/usr/bin/defaults'
# macOS 10.15+ requires 'true'/'false' for -bool, not '0'/'1'.
# 'defaults read' returns '0'/'1', so $value is used in the unless check
# while $write_value is used in the actual write command.
if $val_type == 'bool' {
$write_value = $value ? {
'0' => 'false',
'1' => 'true',
default => $value,
}
else {
fail('Cannot ensure present without domain, key, and value attributes')
} else {
$write_value = $value
}
if ($domain != undef) and ($key != undef) and ($value != undef) {
exec { "osx_defaults write ${domain} ${key}=>${value}" :
command => "${defaults_cmd} write ${domain} ${key} -${val_type} ${write_value}",
unless => "/bin/test x`${defaults_cmd} read ${domain} ${key}` = x'${value}'",
user => $user,
}
}
else {
fail('Cannot ensure present without domain, key, and value attributes')
}
}
7 changes: 5 additions & 2 deletions modules/roles_profiles/manifests/profiles/screensaver.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
class roles_profiles::profiles::screensaver {
case $facts['os']['name'] {
'Darwin': {
# This disables the screensaver
include macos_mobileconfig_profiles::setdefaultscreensaver
mac_profiles_handler::manage { 'org.mozilla.SetDefaultScreensaver':
ensure => 'absent',
}
include macos_disable_screensaver
Mac_profiles_handler::Manage['org.mozilla.SetDefaultScreensaver'] -> Class['macos_disable_screensaver']
}
default: {
fail("${facts['os']['name']} not supported")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
include roles_profiles::profiles::ntp
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
include roles_profiles::profiles::ntp
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
include roles_profiles::profiles::ntp
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::safaridriver
include roles_profiles::profiles::safariupdate
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::safaridriver
include roles_profiles::profiles::safariupdate
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::safaridriver
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::talos
include roles_profiles::profiles::timezone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::safaridriver
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::talos
include roles_profiles::profiles::timezone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::safaridriver
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::talos
include roles_profiles::profiles::timezone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::safaridriver
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::talos
include roles_profiles::profiles::timezone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::safaridriver
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::talos
include roles_profiles::profiles::timezone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
include roles_profiles::profiles::pipconf
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::safaridriver
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::talos
include roles_profiles::profiles::timezone
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::remove_bootstrap_user
include roles_profiles::profiles::signing_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::remove_bootstrap_user
include roles_profiles::profiles::signing_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::remove_bootstrap_user
include roles_profiles::profiles::signing_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::remove_bootstrap_user
include roles_profiles::profiles::signing_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::remove_bootstrap_user
include roles_profiles::profiles::signing_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::remove_bootstrap_user
include roles_profiles::profiles::signing_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
include roles_profiles::profiles::network
include roles_profiles::profiles::ntp
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
include roles_profiles::profiles::network
include roles_profiles::profiles::ntp
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
1 change: 1 addition & 0 deletions modules/roles_profiles/manifests/roles/nss_1_b_osx_1015.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
include roles_profiles::profiles::ntp
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
1 change: 1 addition & 0 deletions modules/roles_profiles/manifests/roles/nss_3_b_osx_1015.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
include roles_profiles::profiles::ntp
include roles_profiles::profiles::packages_installed
include roles_profiles::profiles::relops_users
include roles_profiles::profiles::screensaver
include roles_profiles::profiles::sudo
include roles_profiles::profiles::timezone
include roles_profiles::profiles::users
Expand Down
Loading