X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/75c5da85dcd5a6b5b66040dfd838c2bbf30ba4d5..9de17ece169e2c0f91c5545b328fc0cc2fc6a0f4:/cookbooks/tools/recipes/default.rb

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index 5c872d909..eaceb9d8e 100644
--- 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,36 +17,57 @@
 # 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"
-package "lvm2"
-package "rsyslog"
+package %w[
+  bash-completion
+  dmidecode
+  ethtool
+  lsof
+  lsscsi
+  pciutils
+  screen
+  smartmontools
+  strace
+  sysstat
+  tcpdump
+  usbutils
+  numactl
+  xfsprogs
+  iotop
+  lvm2
+  rsyslog
+  cron
+]
 
 service "rsyslog" do
   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 nano whoopsie] do
   action :purge
 end
 
-# Remove ubuntu "desktop" vestigal package
-package "whoopsie" do
-  action :purge
+# 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"
+  dropin "timezone"
+  environment "TZ" => node[:timezone]
+  notifies :restart, "service[cron]"
+  only_if { node[:timezone] }
+end
+
+# Make sure cron is running
+service "cron" do
+  action [:enable, :start]
 end