Use chef 14 to run tests

[chef.git] / cookbooks / tools / recipes / default.rb

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index a4dc20c3030030f4407258c09787f5e2bb32a4b2..eaceb9d8eac55a7e9761391be0734a8e35efb137 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.


@@ -35,6 +35,7 @@ package %w[
   iotop
   lvm2
   rsyslog
   iotop
   lvm2
   rsyslog

+  cron

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


@@ -42,12 +43,31 @@ service "rsyslog" do
   supports :status => true, :restart => true, :reload => true
 end
 
   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
 
   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
 end