Correct path to geoip directory on 22.04

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

diff --git a/cookbooks/geoipupdate/recipes/default.rb b/cookbooks/geoipupdate/recipes/default.rb
index 2b2c23632c1bc97ce1ed2e10766f20b089374556..036c27881c06262bbfd00589a284dada2b992bdc 100644 (file)
--- 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"
   command "geoipupdate"
   user "root"
   group "root"

-  not_if { 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
 end
 
 systemd_service "geoipupdate" do


@@ -46,7 +46,7 @@ systemd_service "geoipupdate" do
   private_devices true
   protect_system "strict"
   protect_home true
   private_devices true
   protect_system "strict"
   protect_home true

-  read_write_paths %w[/usr/share/GeoIP /var/lib/GeoIP]
+  read_write_paths node[:geoipupdate][:directory]

 end
 
 systemd_timer "geoipupdate" do
 end
 
 systemd_timer "geoipupdate" do