tilecache: fix peer weight

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

diff --git a/cookbooks/geoipupdate/recipes/default.rb b/cookbooks/geoipupdate/recipes/default.rb
index 0c4a84c9cc1eb11297b12ba8668ffda10a1d9884..58bf40d8b032a9c4c982d7d2d2d5d987cbeb4d66 100644 (file)
--- a/cookbooks/geoipupdate/recipes/default.rb
+++ b/cookbooks/geoipupdate/recipes/default.rb
@@ -21,9 +21,7 @@ include_recipe "apt"
 
 license_keys = data_bag_item("geoipupdate", "license-keys")
 
-package "geoipupdate" do
-  action [:install, :upgrade]
-end
+package "geoipupdate"
 
 template "/etc/GeoIP.conf" do
   source "GeoIP.conf.erb"
@@ -37,7 +35,7 @@ execute "geoipdate" do
   command "geoipupdate"
   user "root"
   group "root"
-  not_if { node[:geoipupdate][:editions].all? { |edition| ::File.exist?("/usr/share/GeoIP/#{edition}.mmdb") } }
+  not_if { ENV.key?("TEST_KITCHEN") || node[:geoipupdate][:editions].all? { |edition| ::File.exist?("/usr/share/GeoIP/#{edition}.mmdb") } }
 end
 
 directory "/var/lib/GeoIP" do