X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/bec1c1f513bea40f88f00c54c2d8136737d9de88..f2c5c9e904adce651c4cdb22df13b44b7ac2dc9c:/cookbooks/geoipupdate/recipes/default.rb diff --git a/cookbooks/geoipupdate/recipes/default.rb b/cookbooks/geoipupdate/recipes/default.rb index fedae0011..036c27881 100644 --- a/cookbooks/geoipupdate/recipes/default.rb +++ b/cookbooks/geoipupdate/recipes/default.rb @@ -35,7 +35,7 @@ execute "geoipupdate" do command "geoipupdate" user "root" group "root" - not_if { ENV.key?("TEST_KITCHEN") || node[:geoipupdate][:editions].all? { |edition| ::File.exist?("/usr/share/GeoIP/#{edition}.mmdb") } } + not_if { kitchen? || node[:geoipupdate][:editions].all? { |edition| ::File.exist?("#{node[:geoipupdate][:directory]}/#{edition}.mmdb") } } end systemd_service "geoipupdate" do @@ -46,7 +46,7 @@ systemd_service "geoipupdate" do private_devices true protect_system "strict" protect_home true - read_write_paths "/usr/share/GeoIP" + read_write_paths node[:geoipupdate][:directory] end systemd_timer "geoipupdate" do