X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/77b589abca2c670e5314a318b2b52aa0668a0dc3..41b1edf21c531ee0def59463c5a415af24875d30:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index c17800156..7d75087c9 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -24,6 +24,7 @@ include_recipe "postgresql"
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
+web_passwords = data_bag_item("web", "passwords")
 
 apache_module "alias"
 apache_module "cgi"
@@ -68,17 +69,20 @@ systemd_service "renderd" do
   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]
+  subscribes :restart, "systemd_service[renderd]"
 end
 
 directory "/srv/tile.openstreetmap.org/tiles" do
@@ -115,23 +119,14 @@ end
 
 package "python-cairo"
 package "python-mapnik"
+package "python-setuptools"
 
-package "ttf-dejavu"
-package "ttf-unifont"
-
-if node[:lsb][:release].to_f >= 16.04
-  package "fonts-droid-fallback"
-else
-  package "fonts-droid"
-end
+easy_install_package "pyotp"
 
-package "fonts-sipa-arundina"
-package "fonts-sil-padauk"
-package "fonts-khmeros"
-package "fonts-beng-extra"
-package "fonts-gargi"
-package "fonts-taml-tscu"
-package "fonts-tibetan-machine"
+package "fonts-noto-cjk"
+package "fonts-noto-hinted"
+package "fonts-noto-unhinted"
+package "ttf-unifont"
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
@@ -144,7 +139,7 @@ template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   owner "tile"
   group "tile"
   mode 0o755
-  variables :blocks => blocks
+  variables :blocks => blocks, :totp_key => web_passwords["totp_key"]
 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
@@ -244,6 +239,19 @@ 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 "/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"
@@ -262,15 +270,7 @@ node[:tile][:styles].each do |name, details|
     variables :style => name
   end
 
-  template "/etc/init.d/update-lowzoom-#{name}" do
-    source "update-lowzoom.init.erb"
-    owner "root"
-    group "root"
-    mode 0o755
-    variables :style => name
-  end
-
-  service "update-lowzoom-#{name}" do
+  service "update-lowzoom@#{name}" do
     action :disable
     supports :restart => true
   end
@@ -326,17 +326,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]
@@ -467,6 +470,7 @@ systemd_service "replicate" do
   private_devices true
   protect_system "full"
   protect_home true
+  no_new_privileges true
   restart "on-failure"
 end
 
@@ -497,32 +501,6 @@ template "/etc/cron.d/render-lowzoom" do
   mode 0o644
 end
 
-if node[:lsb][:release].to_f >= 16.04
-  file "/etc/rsyslog.d/20-renderd.conf" do
-    action :delete
-    notifies :restart, "service[rsyslog]"
-  end
-
-  file "/etc/logrotate.d/renderd" do
-    action :delete
-  end
-else
-  template "/etc/rsyslog.d/20-renderd.conf" do
-    source "renderd.rsyslog.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-    notifies :restart, "service[rsyslog]"
-  end
-
-  template "/etc/logrotate.d/renderd" do
-    source "renderd.logrotate.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-  end
-end
-
 package "liblockfile-simple-perl"
 package "libfilesys-df-perl"