Revert "Explcitly disable IPv6 on the IC internal network"

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 85af49c46e8ad01524b57f5bee41e559d1d0a2c3..89489f5bd49c6b2fe4acc45eb955c7bc26eb4357 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -26,6 +26,7 @@ include_recipe "tools"
 blocks = data_bag_item("tile", "blocks")
 
 apache_module "alias"
 blocks = data_bag_item("tile", "blocks")
 
 apache_module "alias"

+apache_module "cgi"

 apache_module "expires"
 apache_module "headers"
 apache_module "remoteip"
 apache_module "expires"
 apache_module "headers"
 apache_module "remoteip"


@@ -187,21 +188,6 @@ node[:tile][:data].each_value do |data|
     end
   end
 
     end
   end
 

-  if data[:processed]
-    original = "#{directory}/#{data[:original]}"
-    processed = "#{directory}/#{data[:processed]}"
-
-    package "gdal-bin"
-
-    execute processed do
-      action :nothing
-      command "ogr2ogr #{processed} #{original}"
-      user "tile"
-      group "tile"
-      subscribes :run, "execute[#{file}]", :immediately
-    end
-  end
-

   execute "#{file}_shapeindex" do
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
   execute "#{file}_shapeindex" do
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"


@@ -214,6 +200,7 @@ node[:tile][:data].each_value do |data|
     if data[:refresh]
       action :create
       use_conditional_get true
     if data[:refresh]
       action :create
       use_conditional_get true

+      ignore_failure true

     else
       action :create_if_missing
     end
     else
       action :create_if_missing
     end


@@ -392,14 +379,17 @@ package "osm2pgsql"
 package "osmosis"
 
 package "ruby"
 package "osmosis"
 
 package "ruby"

-package "rubygems"
+package "ruby-dev"
+
+if node[:lsb][:release].to_f < 14.04
+  package "rubygems"
+end

 
 package "libproj-dev"
 package "libxml2-dev"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
 
 package "libproj-dev"
 package "libxml2-dev"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"

-gem_package "mmap"

 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"
 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"