X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d694a499dfccf56d6290decf56809866cc7b21c6..cef4792d54172b6cc5192b93ec117f6ed5b5d238:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 2e19e9b0e..449f38ffb 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -21,6 +21,7 @@ include_recipe "apache"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"
+include_recipe "python"
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
@@ -37,6 +38,11 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
+ssl_certificate node[:fqdn] do
+  domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
+  notifies :reload, "service[apache2]"
+end
+
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 apache_site "default" do
@@ -76,11 +82,13 @@ systemd_service "renderd" do
   private_network true
   protect_system "full"
   protect_home true
+  no_new_privileges true
   restart "on-failure"
 end
 
 service "renderd" do
   action [:enable, :start]
+  subscribes :restart, "systemd_service[renderd]"
 end
 
 directory "/srv/tile.openstreetmap.org/tiles" do
@@ -115,16 +123,31 @@ template "/srv/tile.openstreetmap.org/html/index.html" do
   mode 0o644
 end
 
-package "python-cairo"
-package "python-mapnik"
-package "python-setuptools"
+package %w[
+  python-cairo
+  python-mapnik
+  python-setuptools
+]
 
-easy_install_package "pyotp"
+python_package "pyotp"
 
-package "fonts-noto-cjk"
-package "fonts-noto-hinted"
-package "fonts-noto-unhinted"
-package "ttf-unifont"
+package %w[
+  fonts-noto-cjk
+  fonts-noto-hinted
+  fonts-noto-unhinted
+  fonts-hanazono
+  ttf-unifont
+]
+
+["NotoSansArabicUI-Regular.ttf", "NotoSansArabicUI-Bold.ttf"].each do |font|
+  remote_file "/usr/share/fonts/truetype/noto/#{font}" do
+    action :create_if_missing
+    source "https://github.com/googlei18n/noto-fonts/raw/master/hinted/#{font}"
+    owner "root"
+    group "root"
+    mode 0o644
+  end
+end
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
@@ -240,7 +263,7 @@ nodejs_package "millstone"
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
   user "tile"
-  exec_start "/usr/local/bin/update-lowzoom-%i"
+  exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
   private_tmp true
   private_devices true
   private_network true
@@ -367,7 +390,12 @@ postgresql_extension "postgis" do
   database "gis"
 end
 
-%w(geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys).each do |table|
+postgresql_extension "hstore" do
+  cluster node[:tile][:database][:cluster]
+  database "gis"
+end
+
+%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys].each do |table|
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
@@ -376,7 +404,7 @@ end
   end
 end
 
-%w(geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads).each do |table|
+%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads].each do |table|
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
@@ -402,14 +430,20 @@ directory "/var/log/tile" do
   mode 0o755
 end
 
-package "osm2pgsql"
-package "osmosis"
+package %w[
+  osm2pgsql
+  osmosis
+]
 
-package "ruby"
-package "ruby-dev"
+package %w[
+  ruby
+  ruby-dev
+]
 
-package "libproj-dev"
-package "libxml2-dev"
+package %w[
+  libproj-dev
+  libxml2-dev
+]
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
@@ -431,19 +465,18 @@ template "/usr/local/bin/expire-tiles" do
   mode 0o755
 end
 
-template "/etc/sudoers.d/tile" do
-  source "sudoers.erb"
-  owner "root"
-  group "root"
-  mode 0o440
-end
-
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
   mode 0o755
 end
 
+directory "/var/lib/replicate/expire-queue" do
+  owner "tile"
+  group "www-data"
+  mode 0o775
+end
+
 template "/var/lib/replicate/configuration.txt" do
   source "replicate.configuration.erb"
   owner "tile"
@@ -458,6 +491,29 @@ template "/usr/local/bin/replicate" do
   mode 0o755
 end
 
+systemd_service "expire-tiles" do
+  description "Tile dirtying service"
+  type "simple"
+  user "www-data"
+  exec_start "/usr/local/bin/expire-tiles"
+  standard_output "null"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true
+end
+
+systemd_path "expire-tiles" do
+  description "Tile dirtying trigger"
+  directory_not_empty "/var/lib/replicate/expire-queue"
+end
+
+service "expire-tiles.path" do
+  action [:enable, :start]
+  subscribes :restart, "systemd_path[expire-tiles]"
+end
+
 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"
@@ -468,6 +524,7 @@ systemd_service "replicate" do
   private_devices true
   protect_system "full"
   protect_home true
+  no_new_privileges true
   restart "on-failure"
 end