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 8424642bfe0df7f6c79ff2eebc3c3447d82ef835..d07ddcfe55e58bcec8bfb43c3706627d4b9f1da3 100644 (file)
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: tools
+# Cookbook:: tools
 # 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.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,40 +17,73 @@
 # limitations under the License.
 #
 
-package "bash-completion"
-package "dmidecode"
-package "ethtool"
-package "lsof"
-package "lsscsi"
-package "pciutils"
-package "screen"
-package "smartmontools"
-package "strace"
-package "sysstat"
-package "tcpdump"
-package "usbutils"
-package "numactl"
-package "xfsprogs"
-package "sysv-rc-conf"
-package "iotop"
-
-if node[:lsb][:release].to_f <= 11.04
-  package "lslk"
-end
-
-package "rsyslog"
+package %w[
+  bash-completion
+  cron
+  curl
+  dmidecode
+  ethtool
+  iotop
+  iptraf-ng
+  locales-all
+  lsof
+  lsscsi
+  lvm2
+  mtr-tiny
+  numactl
+  pciutils
+  rsyslog
+  screen
+  smartmontools
+  strace
+  sysstat
+  systemd-coredump
+  tcpdump
+  usbutils
+  vim
+  xfsprogs
+]
 
 service "rsyslog" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
-# Remove unused base package
-package "mlocate" do
+# Remove some unused and unwanted packages
+package %w[mlocate whoopsie] do
   action :purge
 end
 
-# Remove ubuntu "desktop" vestigal package
-package "whoopsie" do
-  action :purge
+# Configure cron to run in the local timezone of the machine
+systemd_service "cron-timezone" do
+  service "cron"
+  dropin "timezone"
+  environment "TZ" => node[:timezone]
+  notifies :restart, "service[cron]"
+  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
+
+# Ubuntu MOTD adverts be-gone
+template "/etc/default/motd-news" do
+  source "motd-news.erb"
+  owner "root"
+  group "root"
+  mode "644"
 end