X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d80fde945bf46a363d42d245604909ce0d0f3d70..91556e0a1247fa7877b55a95ba29016a715e0ce0:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 2e51fa546..b5b864ffc 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -64,6 +64,7 @@ apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "rewrite"
 apache_module "wsgi"
+apache_module "headers"
 
 gem_package "sqlite3"
 
@@ -135,11 +136,19 @@ search(:accounts, "*:*").each do |account|
   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|
     database_name = details[:database] || "apis_#{name}"
     site_name = "#{name}.apis.dev.openstreetmap.org"
@@ -198,7 +207,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