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 27d6478ae7f118d796e65daf1bde19af090c0196..036c27881c06262bbfd00589a284dada2b992bdc 100644 (file)
--- a/cookbooks/geoipupdate/recipes/default.rb
+++ b/cookbooks/geoipupdate/recipes/default.rb
@@ -21,19 +21,6 @@ include_recipe "apt"
 
 license_keys = data_bag_item("geoipupdate", "license-keys")
 
 
 license_keys = data_bag_item("geoipupdate", "license-keys")
 

-package "geoip-database" do
-  action :purge
-end
-
-package "geoip-database-contrib" do
-  action :purge
-end
-
-package "geoipupdate" do
-  action :purge
-  only_if { ::File.exist?("/etc/cron.d/geoipupdate") }
-end
-

 package "geoipupdate"
 
 template "/etc/GeoIP.conf" do
 package "geoipupdate"
 
 template "/etc/GeoIP.conf" do


@@ -48,11 +35,7 @@ execute "geoipupdate" do
   command "geoipupdate"
   user "root"
   group "root"
   command "geoipupdate"
   user "root"
   group "root"

-  not_if { ENV.key?("TEST_KITCHEN") || node[:geoipupdate][:editions].all? { |edition| ::File.exist?("/usr/share/GeoIP/#{edition}.mmdb") } }
-end
-
-systemd_service "geoipdate" do
-  action :delete
+  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


@@ -63,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 "/usr/share/GeoIP"
+  read_write_paths node[:geoipupdate][:directory]

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


@@ -76,8 +59,3 @@ end
 service "geoipupdate.timer" do
   action [:enable, :start]
 end
 service "geoipupdate.timer" do
   action [:enable, :start]
 end

-
-directory "/var/lib/GeoIP" do
-  action :delete
-  recursive true
-end