imagery: add OpenMap Local 2019 04

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

diff --git a/cookbooks/geoipupdate/recipes/default.rb b/cookbooks/geoipupdate/recipes/default.rb
index 77c62e5ad93b5150be8b6dac3630360d7b0b7eb5..b27b439b6da53a9e921e5175735a541ce7ae5aa9 100644 (file)
--- a/cookbooks/geoipupdate/recipes/default.rb
+++ b/cookbooks/geoipupdate/recipes/default.rb
@@ -27,7 +27,7 @@ template "/etc/GeoIP.conf" do
   source "GeoIP.conf.erb"
   owner "root"
   group "root"
   source "GeoIP.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   variables :license_keys => license_keys
 end
 
   variables :license_keys => license_keys
 end
 


@@ -35,7 +35,7 @@ execute "geoipdate" do
   command "geoipupdate"
   user "root"
   group "root"
   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
 end
 
 directory "/var/lib/GeoIP" do