Install image optimisation tools on rails machines

[chef.git] / cookbooks / web / resources / rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index d7f2e012da8d528510b932175a8777227bbf58b9..8e6d929ccdc1c9d5cd8d330ba86573c682f706fd 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -87,6 +87,17 @@ action :create do
     libmemcached-dev
   ]
 
+  package %w[
+    pngcrush
+    advancecomp
+    optipng
+    pngquant
+    jhead
+    jpegoptim
+    gifsicle
+    libjpeg-turbo-progs
+  ]
+
   gem_package "bundler#{new_resource.ruby}" do
     package_name "bundler"
     version "1.3.5"
@@ -154,7 +165,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\"")