Qualify property names

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 3ba9136613b448f032eb43897a174519c3b4997a..d3e2cac74cff15184b97fee69591817a9c5210b0 100644 (file)
--- 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
       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}"
     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 d7f2e012da8d528510b932175a8777227bbf58b9..4d30aa7ccc9a3f3931c5b6af5ab3c1eb308f76b1 100644 (file)
--- 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!(/^( *)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\"")
     end
 
     line.gsub!(/^( *)email_return_path:.*$/, "\\1email_return_path: \"bounces@openstreetmap.org\"")