Merge remote-tracking branch 'github/pull/704'

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

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index b5e12de2c8b000bd6e216b2d51523d6a87c805be..d07ddcfe55e58bcec8bfb43c3706627d4b9f1da3 100644 (file)
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -19,24 +19,29 @@
 
 package %w[
   bash-completion
 
 package %w[
   bash-completion

+  cron
+  curl

   dmidecode
   ethtool
   dmidecode
   ethtool

+  iotop
+  iptraf-ng
+  locales-all

   lsof
   lsscsi
   lsof
   lsscsi

+  lvm2
+  mtr-tiny
+  numactl

   pciutils
   pciutils

+  rsyslog

   screen
   smartmontools
   strace
   sysstat
   screen
   smartmontools
   strace
   sysstat

+  systemd-coredump

   tcpdump
   usbutils
   tcpdump
   usbutils

-  numactl
+  vim

   xfsprogs
   xfsprogs

-  iotop
-  lvm2
-  rsyslog
-  cron
-  locales-all

 ]
 
 service "rsyslog" do
 ]
 
 service "rsyslog" do


@@ -45,7 +50,7 @@ service "rsyslog" do
 end
 
 # Remove some unused and unwanted packages
 end
 
 # Remove some unused and unwanted packages

-package %w[mlocate nano whoopsie] do
+package %w[mlocate whoopsie] do

   action :purge
 end
 
   action :purge
 end
 


@@ -74,3 +79,11 @@ end
 service "cron" do
   action [:enable, :start]
 end
 service "cron" do
   action [:enable, :start]
 end

+
+# Ubuntu MOTD adverts be-gone
+template "/etc/default/motd-news" do
+  source "motd-news.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end