From: Tom Hughes Date: Mon, 27 Nov 2017 15:40:53 +0000 (+0000) Subject: Qualify property names X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/169f0cfcb0a3b2a41caa94cf65144be1ae693020 Qualify property names --- diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb index 3ba913661..d3e2cac74 100644 --- a/cookbooks/systemd/resources/service.rb +++ b/cookbooks/systemd/resources/service.rb @@ -67,7 +67,7 @@ action :create do owner "root" group "root" mode 0o640 - variables :environment => environment_file + variables :environment => new_resource.environment_file end service_variables[:environment_file] = "/etc/default/#{new_resource.service}" diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index d7f2e012d..4d30aa7cc 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -154,7 +154,7 @@ action :create do line.gsub!(/^( *)support_email:.*$/, "\\1support_email: \"support@openstreetmap.org\"") if new_resource.email_from - line.gsub!(/^( *)email_from:.*$/, "\\1email_from: \"#{email_from}\"") + line.gsub!(/^( *)email_from:.*$/, "\\1email_from: \"#{new_resource.email_from}\"") end line.gsub!(/^( *)email_return_path:.*$/, "\\1email_return_path: \"bounces@openstreetmap.org\"")