nominatim: disable redirect to poldi

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 039f5b204b164bc5d59a92ad4716e01e83bf362a..c31aca83b075830135b9139f64ced44c6ef2e0bc 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"
 


@@ -174,7 +181,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


@@ -191,7 +198,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}" do

         action :delete
       end
 
         action :delete
       end