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 4ab9414df16eb7e38595ec0ee245ae9f22f6f253..d07ddcfe55e58bcec8bfb43c3706627d4b9f1da3 100644 (file)
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: tools
+# Cookbook:: tools

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -19,23 +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

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


@@ -44,20 +50,10 @@ 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
 

-# Remove screen-cleanup left behind by old release.
-file "/etc/init.d/screen-cleanup" do
-  action :delete
-end
-
-# Cleanup unused file
-file "/etc/systemd/system/cron.service.d/chef.conf" do
-  action :delete
-end
-

 # Configure cron to run in the local timezone of the machine
 systemd_service "cron-timezone" do
   service "cron"
 # Configure cron to run in the local timezone of the machine
 systemd_service "cron-timezone" do
   service "cron"


@@ -67,7 +63,27 @@ systemd_service "cron-timezone" do
   only_if { node[:timezone] }
 end
 
   only_if { node[:timezone] }
 end
 

+# Configure cron with lower cpu and IO priority
+if node[:tools][:cron][:load]
+  systemd_service "cron-load" do
+    service "cron"
+    dropin "load"
+    nice node[:tools][:cron][:load][:nice]
+    io_scheduling_class node[:tools][:cron][:load][:io_scheduling_class]
+    io_scheduling_priority node[:tools][:cron][:load][:io_scheduling_priority]
+    notifies :restart, "service[cron]"
+  end
+end
+

 # Make sure cron is running
 service "cron" do
   action [:enable, :start]
 end
 # Make sure cron is running
 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