X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7609b4c7dadb461d16c7c14f18e78782a19ea13d..cdd76b4b4526e93b801d15bf176beca450c91096:/cookbooks/tools/recipes/default.rb

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index 45fc074a4..c12384d6f 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,30 +17,47 @@
 # 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 %w[
+  bash-completion
+  dmidecode
+  ethtool
+  lsof
+  lsscsi
+  pciutils
+  screen
+  smartmontools
+  strace
+  sysstat
+  tcpdump
+  usbutils
+  numactl
+  xfsprogs
+  iotop
+  lvm2
+  rsyslog
+  cron
+]
 
-if node[:lsb][:release].to_f <= 11.04
-  package "lslk"
+service "rsyslog" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
 end
 
-package "rsyslog"
+# Remove some unused and unwanted packages
+package %w[mlocate nano whoopsie] do
+  action :purge
+end
 
-service "rsyslog" do
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
+# 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