Merge branch 'COOK-490'

avit · Apr 4, 2011 · 9251f4b · 9251f4b
2 parents 76e70e1 + 65d95a5
commit 9251f4b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/chef-client/metadata.json b/chef-client/metadata.json
@@ -6,30 +6,14 @@
   "maintainer_email": "cookbooks@opscode.com",
   "license": "Apache 2.0",
   "platforms": {
-    "ubuntu": [
-
-    ],
-    "debian": [
-
-    ],
-    "redhat": [
-
-    ],
-    "centos": [
-
-    ],
-    "fedora": [
-
-    ],
-    "freebsd": [
-
-    ],
-    "openbsd": [
-
-    ],
-    "mac_os_x": [
-
-    ]
+    "ubuntu": ">= 0.0.0",
+    "debian": ">= 0.0.0",
+    "redhat": ">= 0.0.0",
+    "centos": ">= 0.0.0",
+    "fedora": ">= 0.0.0",
+    "freebsd": ">= 0.0.0",
+    "openbsd": ">= 0.0.0",
+    "mac_os_x": ">= 0.0.0"
   },
   "dependencies": {
   },
@@ -53,5 +37,5 @@
     "chef-client::service": "Sets up a client daemon to run periodically",
     "chef-client::delete_validation": "Deletes validation.pem after client registers"
   },
-  "version": "0.99.3"
+  "version": "0.99.4"
 }
diff --git a/chef-client/metadata.rb b/chef-client/metadata.rb
@@ -3,7 +3,7 @@
 license           "Apache 2.0"
 description       "Manages aspects of only chef-client"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           "0.99.3"
+version           "0.99.4"
 recipe            "chef-client", "Includes the service recipe by default."
 recipe            "chef-client::config", "Configures the client.rb from a template."
 recipe            "chef-client::service", "Sets up a client daemon to run periodically"

diff --git a/chef-client/recipes/service.rb b/chef-client/recipes/service.rb
@@ -37,12 +37,12 @@
 
   dist_dir = value_for_platform(
     ["ubuntu", "debian"] => { "default" => "debian" },
-    ["redhat", "centos", "fedora"] => { "default" => "redhat"}
+    ["amazon", "redhat", "centos", "fedora"] => { "default" => "redhat"}
   )
 
   conf_dir = value_for_platform(
     ["ubuntu", "debian"] => { "default" => "default" },
-    ["redhat", "centos", "fedora"] => { "default" => "sysconfig"}
+    ["amazon", "redhat", "centos", "fedora"] => { "default" => "sysconfig"}
   )
 
   chef_version = node.chef_packages.chef["version"]