Convert ohai_plugin to an LWRP

[chef.git] / cookbooks / tools / recipes / default.rb

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index 432f0fd69ae915375b3b9f39cd1a28af63b7cfd4..31770b50f7abe0fbeb6b522a03b5a5e2b2793181 100644 (file)
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -32,11 +32,25 @@ package "usbutils"
 package "numactl"
 package "xfsprogs"
 package "sysv-rc-conf"
-
-if node[:lsb][:release].to_f >= 10.04
-  package "iotop"
-end
+package "iotop"
 
 if node[:lsb][:release].to_f <= 11.04
   package "lslk"
 end
+
+package "rsyslog"
+
+service "rsyslog" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
+end
+
+# Remove unused base package
+package "mlocate" do
+  action :purge
+end
+
+# Remove ubuntu "desktop" vestigal package
+package "whoopsie" do
+  action :purge
+end