X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1399e23b23133c1ff7b8eee39fa5b1ca5c2bdc75..8d38e336ded321d9b61b0f2da2438aaff626f8a4:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 607d723b2..849830bc2 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"
 
@@ -57,6 +64,7 @@ apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "rewrite"
 apache_module "wsgi"
+apache_module "headers"
 
 gem_package "sqlite3"
 
@@ -126,15 +134,30 @@ search(:accounts, "*:*").each do |account|
     directory "#{user_home}/public_html"
     variables :user => name, :port => port
   end
+
+  template "/etc/sudoers.d/#{name}" do
+    source "sudoers.user.erb"
+    owner "root"
+    group "root"
+    mode 0440
+    variables :user => name
+  end
 end
 
-if node[:postgresql][:clusters][:"9.1/main"]
+if node[:postgresql][:clusters][:"9.3/main"]
   postgresql_user "apis" do
     cluster "9.3/main"
   end
 
+  template "/usr/local/bin/cleanup-rails-assets" do
+    cookbook "web"
+    source "cleanup-assets.erb"
+    owner "root"
+    group "root"
+    mode 0755
+  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"
@@ -192,7 +215,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.tr('.', '-')}" do
         action :delete
       end