X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/541ddf990024bb235eb44265f584125dd641063f..794cc957324de66edab45373053be3e601090f1f:/cookbooks/tools/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index 5154ecd12..d07ddcfe5 100644
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# 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.
@@ -19,23 +19,29 @@
 
 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
-  numactl
+  vim
   xfsprogs
-  iotop
-  lvm2
-  rsyslog
-  cron
 ]
 
 service "rsyslog" do
@@ -44,33 +50,40 @@ service "rsyslog" do
 end
 
 # Remove some unused and unwanted packages
-package %w[mlocate nano whoopsie] do
+package %w[mlocate whoopsie] do
   action :purge
 end
 
-# Remove screen-cleanup left behind by old release.
-file "/etc/init.d/screen-cleanup" do
-  action :delete
-end
-
-# Create drop in directory for cron service
-directory "/etc/systemd/system/cron.service.d" do
-  owner "root"
-  group "root"
-  mode 0o755
-end
-
 # Configure cron to run in the local timezone of the machine
-template "/etc/systemd/system/cron.service.d/chef.conf" do
-  source "cron.service.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+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