From: Tom Hughes Date: Sat, 9 Jan 2016 11:42:41 +0000 (+0000) Subject: Don't use dots in cron.daily file names X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b950c1532294e17c9770e1441168bca268bd8313?hp=587153f55f561d1b1ea8814d5cce1f19cccdd9f1 Don't use dots in cron.daily file names --- diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index a57432411..19539c9dc 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -206,7 +206,7 @@ if node[:postgresql][:clusters][:"9.3/main"] recursive true end - file "/etc/cron.daily/rails-#{site_name}" do + file "/etc/cron.daily/rails-#{site_name.tr('.', '-')}" do action :delete end diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index 83d0a1a36..f0dd581d8 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -283,7 +283,7 @@ define :rails_port, :action => [:create, :enable] do only_if { File.exist?("/usr/bin/passenger-config") } end - template "/etc/cron.daily/rails-#{name}" do + template "/etc/cron.daily/rails-#{name.tr('.', '-')}" do cookbook "web" source "rails.cron.erb" owner "root"