X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/229bfd4d1ef647515f13b6e8e064a957881f2ca7..8f64e2934813c9e8c50188de33adb10f5664780d:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 62eac34c4..c31aca83b 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -24,6 +24,7 @@ include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
 include_recipe "mysql"
+include_recipe "nodejs"
 include_recipe "postgresql"
 
 package "php-apc"
@@ -41,6 +42,9 @@ package "php5-mysql"
 package "php5-pgsql"
 package "php5-sqlite"
 
+package "pngcrush"
+package "pngquant"
+
 package "python"
 package "python-argparse"
 package "python-beautifulsoup"
@@ -48,6 +52,9 @@ package "python-cheetah"
 package "python-dateutil"
 package "python-magic"
 package "python-psycopg2"
+package "python-gdal"
+
+nodejs_package "svgo"
 
 easy_install_package "geojson"
 
@@ -134,7 +141,6 @@ if node[:postgresql][:clusters][:"9.1/main"]
   end
 
   node[:dev][:rails].each do |name, details|
-    ruby node[:passenger][:ruby_version]
     database_name = details[:database] || "apis_#{name}"
     site_name = "#{name}.apis.dev.openstreetmap.org"
     rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org"
@@ -175,7 +181,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
         group "apis"
         mode 0644
         variables :site => site_name
-        notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+        notifies :run, "execute[#{rails_directory}]"
       end
 
       apache_site site_name do
@@ -192,7 +198,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
         recursive true
       end
 
-      file "/etc/cron.daily/rails-#{name}" do
+      file "/etc/cron.daily/rails-#{site_name}" do
         action :delete
       end