Don't try and install rubygems for ruby 2.1

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 89212c2ee4aee8ebc2859f7ccdd6565d65ed0a49..4ab6b8bbda23489c4760aaaecb3ed2a284e0891e 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"


@@ -214,6 +215,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,6 +394,7 @@ package "osm2pgsql"
 package "osmosis"
 
 package "ruby"
 package "osmosis"
 
 package "ruby"

+package "ruby-dev"

 
 if node[:lsb][:release].to_f < 14.04
   package "rubygems"
 
 if node[:lsb][:release].to_f < 14.04
   package "rubygems"


@@ -402,7 +405,6 @@ package "libxml2-dev"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
 
 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"