X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c1f8c12f959968e3e110b2f9768bf0950686e83e..5b4f815f6cd8433be1d66b8376b71452f974b225:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 6b3e7b9c9..6cdf6190f 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -21,11 +21,14 @@ include_recipe "apache"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"
+include_recipe "python"
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
+web_passwords = data_bag_item("web", "passwords")
 
 apache_module "alias"
+apache_module "cgi"
 apache_module "expires"
 apache_module "headers"
 apache_module "remoteip"
@@ -38,7 +41,7 @@ end
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 apache_site "default" do
-  action [ :disable ]
+  action [:disable]
 end
 
 apache_site "tile.openstreetmap.org" do
@@ -50,33 +53,50 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 package "renderd"
 
+systemd_service "renderd" do
+  description "Mapnik rendering daemon"
+  after "postgresql.service"
+  wants "postgresql.service"
+  user "www-data"
+  exec_start "/usr/bin/renderd -f"
+  runtime_directory "renderd"
+  standard_error "null"
+  private_tmp true
+  private_devices true
+  private_network true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true
+  restart "on-failure"
+end
+
 service "renderd" do
-  action [ :enable, :start ]
-  supports :status => false, :restart => true, :reload => false
+  action [:enable, :start]
+  subscribes :restart, "systemd_service[renderd]"
 end
 
 directory "/srv/tile.openstreetmap.org/tiles" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end
@@ -85,67 +105,81 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   source "html"
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
   files_owner "tile"
   files_group "tile"
-  files_mode 0644
+  files_mode 0o644
 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"
-  mode 0644
+  mode 0o644
 end
 
 package "python-cairo"
 package "python-mapnik"
-package "ttf-dejavu"
+package "python-setuptools"
+
+python_package "pyotp"
+
+package "fonts-noto-cjk"
+package "fonts-noto-hinted"
+package "fonts-noto-unhinted"
+package "fonts-hanazono"
 package "ttf-unifont"
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"
-  mode 0755
-  variables :blocks => blocks
+  mode 0o755
+  variables :blocks => blocks, :totp_key => web_passwords["totp_key"]
 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   source "debug.erb"
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.hourly/export" do
   source "export.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
-node[:tile][:data].each do |name,data|
+package "mapnik-utils"
+
+node[:tile][:data].each_value do |data|
   url = data[:url]
   file = "/srv/tile.openstreetmap.org/data/#{File.basename(url)}"
-  directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}"
 
-  directory directory do
-    owner "tile"
-    group "tile"
-    mode 0755
+  if data[:directory]
+    directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}"
+
+    directory directory do
+      owner "tile"
+      group "tile"
+      mode 0o755
+    end
+  else
+    directory = "/srv/tile.openstreetmap.org/data"
   end
 
   if file =~ /\.tgz$/
@@ -177,21 +211,6 @@ node[:tile][:data].each do |name,data|
     end
   end
 
-  if data[:processed]
-    original = "#{directory}/#{data[:original]}"
-    processed = "#{directory}/#{data[:processed]}"
-
-    package "gdal-bin"
-
-    execute processed do
-      action :nothing
-      command "ogr2ogr #{processed} #{original}"
-      user "tile"
-      group "tile"
-      subscribes :run, "execute[#{file}]", :immediately
-    end
-  end
-
   execute "#{file}_shapeindex" do
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
@@ -204,14 +223,15 @@ node[:tile][:data].each do |name,data|
     if data[:refresh]
       action :create
       use_conditional_get true
+      ignore_failure true
     else
-      action :create_if_missing 
+      action :create_if_missing
     end
 
     source url
     owner "tile"
     group "tile"
-    mode 0644
+    mode 0o644
     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"
@@ -221,13 +241,26 @@ end
 nodejs_package "carto"
 nodejs_package "millstone"
 
+systemd_service "update-lowzoom@" do
+  description "Low zoom tile update service for %i layer"
+  user "tile"
+  exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
+  private_tmp true
+  private_devices true
+  private_network true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true
+  restart "on-failure"
+end
+
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
-node[:tile][:styles].each do |name,details|
+node[:tile][:styles].each do |name, details|
   style_directory = "/srv/tile.openstreetmap.org/styles/#{name}"
   tile_directory = "/srv/tile.openstreetmap.org/tiles/#{name}"
 
@@ -235,19 +268,11 @@ node[:tile][:styles].each do |name,details|
     source "update-lowzoom.erb"
     owner "root"
     group "root"
-    mode 0755
-    variables :style => name
-  end
-
-  template "/etc/init.d/update-lowzoom-#{name}" do
-    source "update-lowzoom.init.erb"
-    owner "root"
-    group "root"
-    mode 0755
+    mode 0o755
     variables :style => name
   end
 
-  service "update-lowzoom-#{name}" do
+  service "update-lowzoom@#{name}" do
     action :disable
     supports :restart => true
   end
@@ -255,21 +280,21 @@ node[:tile][:styles].each do |name,details|
   directory tile_directory do
     owner "tile"
     group "tile"
-    mode 0755
+    mode 0o755
   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
       owner "www-data"
       group "www-data"
-      mode 0755
+      mode 0o755
     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do
         owner "www-data"
         group "www-data"
-        mode 0755
+        mode 0o755
       end
 
       link "#{tile_directory}/#{zoom}" do
@@ -284,7 +309,7 @@ node[:tile][:styles].each do |name,details|
     action :create_if_missing
     owner "tile"
     group "tile"
-    mode 0444
+    mode 0o444
   end
 
   git style_directory do
@@ -303,17 +328,20 @@ node[:tile][:styles].each do |name,details|
 
   execute "#{style_directory}/project.mml" do
     action :nothing
-    command "carto project.mml > project.xml"
+    command "carto -a 3.0.0 project.mml > project.xml"
     cwd style_directory
     user "tile"
     group "tile"
     subscribes :run, "git[#{style_directory}]"
     notifies :restart, "service[renderd]", :immediately
-    notifies :restart, "service[update-lowzoom-#{name}]"
+    notifies :restart, "service[update-lowzoom@#{name}]"
   end
 end
 
+postgresql_version = node[:tile][:database][:cluster].split("/").first
+
 package "postgis"
+package "postgresql-#{postgresql_version}-postgis-2.3"
 
 postgresql_user "jburgess" do
   cluster node[:tile][:database][:cluster]
@@ -343,13 +371,12 @@ postgresql_extension "postgis" do
   database "gis"
 end
 
-[ "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"
@@ -358,11 +385,7 @@ end
   end
 end
 
-[ "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"
@@ -379,113 +402,132 @@ end
 file node[:tile][:node_file] do
   owner "tile"
   group "www-data"
-  mode 0640
+  mode 0o640
 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 package "osm2pgsql"
 package "osmosis"
 
 package "ruby"
-package "rubygems"
+package "ruby-dev"
 
 package "libproj-dev"
 package "libxml2-dev"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
-gem_package "mmap"
 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0644
+  files_mode 0o644
 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"
-  mode 0755
-end
-
-template "/etc/sudoers.d/tile" do
-  source "sudoers.erb"
-  owner "root"
-  group "root"
-  mode 0440
+  mode 0o755
 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
-  mode 0755
+  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"
   group "tile"
-  mode 0644
+  mode 0o644
 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
-template "/etc/init.d/replicate" do
-  source "replicate.init.erb"
-  owner "root"
-  group "root"
-  mode 0755
+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"
+  wants "postgresql.service"
+  user "tile"
+  exec_start "/usr/local/bin/replicate"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true
+  restart "on-failure"
 end
 
 service "replicate" do
-  action [ :enable, :start ]
-  supports :restart => true
+  action [:enable, :start]
   subscribes :restart, "template[/usr/local/bin/replicate]"
-  subscribes :restart, "template[/etc/init.d/replicate]"
+  subscribes :restart, "systemd_service[replicate]"
 end
 
 template "/etc/logrotate.d/replicate" do
   source "replicate.logrotate.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.d/render-lowzoom" do
   source "render-lowzoom.cron.erb"
   owner "root"
   group "root"
-  mode 0644
-end
-
-template "/etc/rsyslog.d/20-renderd.conf" do
-  source "renderd.rsyslog.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  notifies :restart, "service[rsyslog]"
+  mode 0o644
 end
 
 package "liblockfile-simple-perl"
@@ -495,10 +537,10 @@ template "/usr/local/bin/cleanup-tiles" do
   source "cleanup-tiles.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
-tile_directories = node[:tile][:styles].collect do |name,style|
+tile_directories = node[:tile][:styles].collect do |_, style|
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq
 
@@ -506,7 +548,7 @@ template "/etc/cron.d/cleanup-tiles" do
   source "cleanup-tiles.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :directories => tile_directories
 end