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 5154ecd128a188d8c970e9b5ac58adf9c08e7983..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
 #
-# 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.
@@ -53,19 +53,16 @@ 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
+# 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
-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