diff options
Diffstat (limited to 'lib/chef')
-rw-r--r-- | lib/chef/provider/user/mac.rb | 5 | ||||
-rw-r--r-- | lib/chef/providers.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/user/dscl_user.rb | 35 | ||||
-rw-r--r-- | lib/chef/resource/user/mac_user.rb | 2 | ||||
-rw-r--r-- | lib/chef/resources.rb | 1 |
5 files changed, 3 insertions, 41 deletions
diff --git a/lib/chef/provider/user/mac.rb b/lib/chef/provider/user/mac.rb index 5604244f7f..573d28644b 100644 --- a/lib/chef/provider/user/mac.rb +++ b/lib/chef/provider/user/mac.rb @@ -29,13 +29,12 @@ class Chef class User # A macOS user provider that is compatible with default TCC restrictions # in macOS 10.14. See resource/user/mac_user.rb for complete description - # of the mac_user resource and how it differs from the dscl resource used - # on previous platforms. + # of the mac_user resource class MacUser < Chef::Provider::User include Chef::Mixin::Which provides :mac_user - provides :user, os: "darwin", platform_version: ">= 10.14" + provides :user, os: "darwin" attr_reader :user_plist, :admin_group_plist diff --git a/lib/chef/providers.rb b/lib/chef/providers.rb index 7652d60896..331f224855 100644 --- a/lib/chef/providers.rb +++ b/lib/chef/providers.rb @@ -94,7 +94,6 @@ require_relative "provider/service/aixinit" require_relative "provider/service/aix" require_relative "provider/user/aix" -require_relative "provider/user/dscl" require_relative "provider/user/linux" require_relative "provider/user/mac" require_relative "provider/user/pw" diff --git a/lib/chef/resource/user/dscl_user.rb b/lib/chef/resource/user/dscl_user.rb deleted file mode 100644 index 91efd657de..0000000000 --- a/lib/chef/resource/user/dscl_user.rb +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright:: Copyright (c) Chef Software Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require_relative "../user" - -class Chef - class Resource - class User - class DsclUser < Chef::Resource::User - unified_mode true - - provides :dscl_user - provides :user, platform: "mac_os_x", platform_version: "< 10.14" - - property :iterations, Integer, - description: "macOS platform only. The number of iterations for a password with a SALTED-SHA512-PBKDF2 shadow hash.", - default: 27855, desired_state: false - end - end - end -end diff --git a/lib/chef/resource/user/mac_user.rb b/lib/chef/resource/user/mac_user.rb index 2331283bbd..93eef5e893 100644 --- a/lib/chef/resource/user/mac_user.rb +++ b/lib/chef/resource/user/mac_user.rb @@ -61,7 +61,7 @@ class Chef unified_mode true provides :mac_user - provides :user, platform: "mac_os_x", platform_version: ">= 10.14" + provides :user, platform: "mac_os_x" introduced "15.3" diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb index 843d5610b8..8ae922a28b 100644 --- a/lib/chef/resources.rb +++ b/lib/chef/resources.rb @@ -125,7 +125,6 @@ require_relative "resource/smartos_package" require_relative "resource/template" require_relative "resource/user" require_relative "resource/user/aix_user" -require_relative "resource/user/dscl_user" require_relative "resource/user/linux_user" require_relative "resource/user/mac_user" require_relative "resource/user/pw_user" |