X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..4ec4df296aa902456762ea9b95e6c6e4033e1076:/cookbooks/tile/recipes/default.rb?ds=inline

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 9128b4e2b..80807a0d3 100644
--- 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.
@@ -17,8 +17,10 @@
 # limitations under the License.
 #
 
+include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
+include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "python"
@@ -358,9 +360,9 @@ node[:tile][:styles].each do |name, details|
 end
 
 postgresql_version = node[:tile][:database][:cluster].split("/").first
+postgis_version = node[:tile][:database][:postgis]
 
-package "postgis"
-package "postgresql-#{postgresql_version}-postgis-2.3"
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
 
 postgresql_user "jburgess" do
   cluster node[:tile][:database][:cluster]
@@ -393,6 +395,7 @@ end
 postgresql_extension "hstore" do
   cluster node[:tile][:database][:cluster]
   database "gis"
+  only_if { node[:tile][:database][:hstore] }
 end
 
 %w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys].each do |table|
@@ -418,10 +421,17 @@ postgresql_munin "gis" do
   database "gis"
 end
 
-file node[:tile][:node_file] do
+directory File.dirname(node[:tile][:database][:node_file]) do
+  owner "root"
+  group "root"
+  mode 0o755
+  recursive true
+end
+
+file node[:tile][:database][:node_file] do
   owner "tile"
   group "www-data"
-  mode 0o640
+  mode 0o660
 end
 
 directory "/var/log/tile" do
@@ -432,30 +442,20 @@ end
 
 package %w[
   osm2pgsql
-  osmosis
-]
-
-package %w[
   ruby
-  ruby-dev
-]
-
-package %w[
-  libproj-dev
-  libxml2-dev
+  osmium-tool
+  pyosmium
+  python-pyproj
 ]
 
-gem_package "proj4rb"
-gem_package "libxml-ruby"
-
-remote_directory "/usr/local/lib/site_ruby" do
-  source "ruby"
+remote_directory "/usr/local/bin" do
+  source "bin"
   owner "root"
   group "root"
   mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0o644
+  files_mode 0o755
 end
 
 template "/usr/local/bin/expire-tiles" do
@@ -477,18 +477,12 @@ 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"
   group "root"
   mode 0o755
+  variables :postgresql_version => postgresql_version.to_f
 end
 
 systemd_service "expire-tiles" do
@@ -548,11 +542,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"
@@ -588,6 +600,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"