Try and ensure tile server use an integer number of listen buckets

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

diff --git a/cookbooks/geoipupdate/recipes/default.rb b/cookbooks/geoipupdate/recipes/default.rb
index 3b116c8691c60a9622fd82140c3fd76f0950db2c..17fcc0850df25501496635a42046430b85a8711f 100644 (file)
--- a/cookbooks/geoipupdate/recipes/default.rb
+++ b/cookbooks/geoipupdate/recipes/default.rb
@@ -17,23 +17,10 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apt"
+include_recipe "apt::maxmind"

 
 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,10 +35,24 @@ 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") } }
+  not_if { kitchen? || node[:geoipupdate][:editions].all? { |edition| ::File.exist?("#{node[:geoipupdate][:directory]}/#{edition}.mmdb") } }
+end
+
+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 "4h"

 end
 
 end
 

-directory "/var/lib/GeoIP" do
-  action :delete
-  recursive true
+service "geoipupdate.timer" do
+  action [:enable, :start]

 end
 end