X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a98035c2fefcff6c436b1e3c05cad4cf81975d89..b7c12630cb9de017d76fe60ff296534d6d061399:/cookbooks/geoipupdate/recipes/default.rb diff --git a/cookbooks/geoipupdate/recipes/default.rb b/cookbooks/geoipupdate/recipes/default.rb index 77c62e5ad..b87f5e822 100644 --- a/cookbooks/geoipupdate/recipes/default.rb +++ b/cookbooks/geoipupdate/recipes/default.rb @@ -17,7 +17,7 @@ # limitations under the License. # -include_recipe "apt" +include_recipe "apt::maxmind" license_keys = data_bag_item("geoipupdate", "license-keys") @@ -27,18 +27,32 @@ template "/etc/GeoIP.conf" do source "GeoIP.conf.erb" owner "root" group "root" - mode 0o644 + mode "644" variables :license_keys => license_keys end -execute "geoipdate" do +execute "geoipupdate" do command "geoipupdate" user "root" group "root" - not_if { 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 -directory "/var/lib/GeoIP" do - action :delete - recursive true +systemd_service "geoipupdate" do + description "Update GeoIP databases" + user "root" + exec_start "/usr/bin/geoipupdate" + sandbox :enable_network => true + read_write_paths node[:geoipupdate][:directory] +end + +systemd_timer "geoipupdate" do + description "Update GeoIP databases" + on_boot_sec "15m" + on_unit_active_sec "7d" + randomized_delay_sec "5d" +end + +service "geoipupdate.timer" do + action [:enable, :start] end