From: Tom Hughes <tom@compton.nu>
Date: Sun, 13 Sep 2015 09:57:05 +0000 (+0100)
Subject: Install svgo on machines running the rails port
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d80fde945bf46a363d42d245604909ce0d0f3d70?hp=bfebbbf7479abdcb4ea8d32cdaa194c254d01dfc

Install svgo on machines running the rails port
---

diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb
index 361e9f628..8b5c166b7 100644
--- a/cookbooks/dev/metadata.rb
+++ b/cookbooks/dev/metadata.rb
@@ -9,6 +9,7 @@ depends           "apache"
 depends           "passenger"
 depends           "git"
 depends           "mysql"
+depends           "nodejs"
 depends           "postgresql"
 depends           "tools"
 depends           "web"
diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 336fad65d..2e51fa546 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"
@@ -53,6 +54,8 @@ package "python-magic"
 package "python-psycopg2"
 package "python-gdal"
 
+nodejs_package "svgo"
+
 easy_install_package "geojson"
 
 apache_module "env"
diff --git a/cookbooks/web/metadata.rb b/cookbooks/web/metadata.rb
index 780e9307f..68d85c079 100644
--- a/cookbooks/web/metadata.rb
+++ b/cookbooks/web/metadata.rb
@@ -9,4 +9,5 @@ depends           "apache"
 depends           "passenger"
 depends           "git"
 depends           "memcached"
+depends           "nodejs"
 depends           "tools"
diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 4c8d3fb55..f6236c891 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -23,10 +23,13 @@ include_recipe "web::base"
 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
+include_recipe "nodejs"
 
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")
 
+nodejs_package "svgo"
+
 template "/etc/cron.hourly/passenger" do
   cookbook "web"
   source "passenger.cron.erb"