Enable ChefModernize/CronDFileOrTemplate cop

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 93def5b398f96c9322b41aa9f36009829a219aa3..6be451ec0828efa84faf727855e020e10fcbe886 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -27,10 +27,6 @@ ChefCorrectness/NodeNormalUnless:
     - 'cookbooks/mediawiki/resources/site.rb'
     - 'cookbooks/wordpress/resources/site.rb'
 
     - 'cookbooks/mediawiki/resources/site.rb'
     - 'cookbooks/wordpress/resources/site.rb'
 

-# Offense count: 23
-ChefModernize/CronDFileOrTemplate:
-  Enabled: false
-

 # Offense count: 1
 # Configuration parameters: Include.
 # Include: **/definitions/*.rb
 # Offense count: 1
 # Configuration parameters: Include.
 # Include: **/definitions/*.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 0ff2dcc7463009ed032954124920534b03e42fb8..3146ab37f57bf5c9aaa5a182e6c68fed394e206b 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -175,10 +175,6 @@ action :create do
     notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
   end
 
     notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
   end
 

-  file "/etc/cron.d/mediawiki-#{cron_name}" do
-    action :delete
-  end
-

   cron_d "mediawiki-#{cron_name}-sitemap" do
     comment "Generate sitemap.xml daily"
     minute "30"
   cron_d "mediawiki-#{cron_name}-sitemap" do
     comment "Generate sitemap.xml daily"
     minute "30"

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 78bede8ce5eb220fd79ad946686df07482ad3669..d9297574222e767251df891cb61fef9c38ba5b55 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -262,10 +262,6 @@ remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
   mode 0o644
 end
 
   mode 0o644
 end
 

-file "/etc/cron.d/nominatim" do
-  action :delete
-end
-

 if node[:nominatim][:state] == "off"
   cron_d "nominatim-backup" do
     action :delete
 if node[:nominatim][:state] == "off"
   cron_d "nominatim-backup" do
     action :delete

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index c5dc7c87fa047c1434840043d223103f1426bf94..e9a569bd18937722b4655a0370be3f1c74e9eec6 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -578,10 +578,6 @@ tile_directories = node[:tile][:styles].collect do |_, style|
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq
 
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq
 

-file "/etc/cron.d/cleanup-tiles" do
-  action :delete
-end
-

 tile_directories.each do |directory|
   label = directory.gsub("/", "-")
 
 tile_directories.each do |directory|
   label = directory.gsub("/", "-")
 

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 9ec7b2aeb6ef87f403beef7bf1d6c18cee8aecfb..adc2226855e839d46238f31b96430c32f0dc2d01 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -123,7 +123,7 @@ template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   variables :totp_key => web_passwords["totp_key"]
 end
 
   variables :totp_key => web_passwords["totp_key"]
 end
 

-file "/etc/cron.d/tilecache" do
+cron_d "tilecache" do

   action :delete
 end
 
   action :delete
 end