Merge branch 'CHEF-1690'

cstewart87 · Mar 18, 2011 · 6a5c157 · 6a5c157
2 parents 96529ad + 11bd6e5
commit 6a5c157
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/chef/lib/chef/platform.rb b/chef/lib/chef/platform.rb
@@ -47,6 +47,13 @@ def platforms
               :group => Chef::Provider::Group::Dscl
             }
           },
+          :mac_os_x_server => {
+            :default => {
+              :package => Chef::Provider::Package::Macports,
+              :user => Chef::Provider::User::Dscl,
+              :group => Chef::Provider::Group::Dscl
+            }
+          },
           :freebsd => {
             :default => {
               :group   => Chef::Provider::Group::Pw,

diff --git a/chef/spec/unit/platform_spec.rb b/chef/spec/unit/platform_spec.rb
@@ -21,6 +21,7 @@
 describe "Chef::Platform supports" do
   [
     :mac_os_x,
+    :mac_os_x_server,
     :freebsd,
     :ubuntu,
     :debian,