Update hardware cookbook for new version of Intel SSD tool

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 4d08e6c1079fa3c6777699604f983e4a07a38251..ead3638aacb063c51f14cffedd0f579e7923eeb3 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: tile
+# Cookbook:: tile
 # Recipe:: default
 #
-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -433,59 +433,27 @@ end
 
 package %w[
   osm2pgsql
-  osmosis
+  ruby
+  osmium-tool
+  pyosmium
+  python-pyproj
 ]
 
-if node[:lsb][:release].to_f >= 18.04
-  package %w[
-    ruby
-    pyosmium
-    python-pyproj
-  ]
-
-  remote_directory "/usr/local/bin" do
-    source "bin"
-    owner "root"
-    group "root"
-    mode 0o755
-    files_owner "root"
-    files_group "root"
-    files_mode 0o755
-  end
-
-  template "/usr/local/bin/expire-tiles" do
-    source "expire-tiles.bionic.erb"
-    owner "root"
-    group "root"
-    mode 0o755
-  end
-else
-  package %w[
-    ruby
-    ruby-dev
-    libproj-dev
-    libxml2-dev
-  ]
-
-  gem_package "proj4rb"
-  gem_package "libxml-ruby"
-
-  remote_directory "/usr/local/lib/site_ruby" do
-    source "ruby"
-    owner "root"
-    group "root"
-    mode 0o755
-    files_owner "root"
-    files_group "root"
-    files_mode 0o644
-  end
+remote_directory "/usr/local/bin" do
+  source "bin"
+  owner "root"
+  group "root"
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o755
+end
 
-  template "/usr/local/bin/expire-tiles" do
-    source "expire-tiles.xenial.erb"
-    owner "root"
-    group "root"
-    mode 0o755
-  end
+template "/usr/local/bin/expire-tiles" do
+  source "expire-tiles.erb"
+  owner "root"
+  group "root"
+  mode 0o755
 end
 
 directory "/var/lib/replicate" do
@@ -500,13 +468,6 @@ directory "/var/lib/replicate/expire-queue" do
   mode 0o775
 end
 
-template "/var/lib/replicate/configuration.txt" do
-  source "replicate.configuration.erb"
-  owner "tile"
-  group "tile"
-  mode 0o644
-end
-
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
@@ -571,11 +532,29 @@ template "/usr/local/bin/render-lowzoom" do
   mode 0o755
 end
 
-template "/etc/cron.d/render-lowzoom" do
-  source "render-lowzoom.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+systemd_service "render-lowzoom" do
+  description "Render low zoom tiles"
+  user "tile"
+  exec_start "/usr/local/bin/render-lowzoom"
+  private_tmp true
+  private_devices true
+  private_network true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true
+end
+
+systemd_timer "render-lowzoom" do
+  description "Render low zoom tiles"
+  on_calendar "Sun *-*~07/1 01:00:00"
+end
+
+service "render-lowzoom.timer" do
+  action [:enable, :start]
+end
+
+file "/etc/cron.d/render-lowzoom" do
+  action :delete
 end
 
 package "liblockfile-simple-perl"
@@ -611,6 +590,4 @@ munin_plugin "renderd_queue_time"
 munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"
 
-munin_plugin "replication_delay" do
-  conf "munin.erb"
-end
+munin_plugin "replication_delay"