Qualify property names
authorTom Hughes <tom@compton.nu>
Mon, 27 Nov 2017 15:40:53 +0000 (15:40 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 27 Nov 2017 15:40:53 +0000 (15:40 +0000)
cookbooks/systemd/resources/service.rb
cookbooks/web/resources/rails_port.rb

index 3ba9136..d3e2cac 100644 (file)
@@ -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}"
index d7f2e01..4d30aa7 100644 (file)
@@ -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\"")