Fix nginx cache zone in imagery

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index a724d69c53cd3f0a1eecb54c9d982adaf0c2fc53..849830bc24a9876146c4315ec44b44feaf870023 100644 (file)
--- 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 "passenger"
 include_recipe "git"
 include_recipe "mysql"

+include_recipe "nodejs"

 include_recipe "postgresql"
 
 package "php-apc"
 include_recipe "postgresql"
 
 package "php-apc"


@@ -41,6 +42,9 @@ package "php5-mysql"
 package "php5-pgsql"
 package "php5-sqlite"
 
 package "php5-pgsql"
 package "php5-sqlite"
 

+package "pngcrush"
+package "pngquant"
+

 package "python"
 package "python-argparse"
 package "python-beautifulsoup"
 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-dateutil"
 package "python-magic"
 package "python-psycopg2"

+package "python-gdal"
+
+nodejs_package "svgo"

 
 easy_install_package "geojson"
 
 
 easy_install_package "geojson"
 


@@ -57,6 +64,7 @@ apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "rewrite"
 apache_module "wsgi"
 apache_module "proxy_fcgi"
 apache_module "rewrite"
 apache_module "wsgi"

+apache_module "headers"

 
 gem_package "sqlite3"
 
 
 gem_package "sqlite3"
 


@@ -66,7 +74,7 @@ end
 
 service "php5-fpm" do
   provider Chef::Provider::Service::Upstart
 
 service "php5-fpm" do
   provider Chef::Provider::Service::Upstart

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -103,35 +111,52 @@ end
 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}

+
+  next unless %w(user administrator).include?(details[:status])
+
+  user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
+
+  next unless File.directory?("#{user_home}/public_html")
+

   port = 7000 + account["uid"].to_i
 
   port = 7000 + account["uid"].to_i
 

-  if %w(user administrator).include?(details[:status])
-    user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
+  template "/etc/php5/fpm/pool.d/#{name}.conf" do
+    source "fpm.conf.erb"
+    owner "root"
+    group "root"
+    mode 0644
+    variables :user => name, :port => port
+    notifies :reload, "service[php5-fpm]"
+  end

 
 

-    if File.directory?("#{user_home}/public_html")
-      template "/etc/php5/fpm/pool.d/#{name}.conf" do
-        source "fpm.conf.erb"
-        owner "root"
-        group "root"
-        mode 0644
-        variables :user => name, :port => port
-        notifies :reload, "service[php5-fpm]"
-      end
+  apache_site "#{name}.dev.openstreetmap.org" do
+    template "apache.user.erb"
+    directory "#{user_home}/public_html"
+    variables :user => name, :port => port
+  end

 
 

-      apache_site "#{name}.dev.openstreetmap.org" do
-        template "apache.user.erb"
-        directory "#{user_home}/public_html"
-        variables :user => name, :port => port
-      end
-    end
+  template "/etc/sudoers.d/#{name}" do
+    source "sudoers.user.erb"
+    owner "root"
+    group "root"
+    mode 0440
+    variables :user => name

   end
 end
 
   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
 
   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"
   node[:dev][:rails].each do |name, details|
     database_name = details[:database] || "apis_#{name}"
     site_name = "#{name}.apis.dev.openstreetmap.org"


@@ -173,7 +198,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
         group "apis"
         mode 0644
         variables :site => site_name
         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
       end
 
       apache_site site_name do


@@ -182,7 +207,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
       end
     else
       apache_site site_name do
       end
     else
       apache_site site_name do

-        action [ :delete ]
+        action [:delete]

       end
 
       directory rails_directory do
       end
 
       directory rails_directory do


@@ -190,7 +215,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
         recursive true
       end
 
         recursive true
       end
 

-      file "/etc/cron.daily/rails-#{name}" do
+      file "/etc/cron.daily/rails-#{site_name.tr('.', '-')}" do

         action :delete
       end
 
         action :delete
       end