Drop groups.apis.dev.openstreetmap.org

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index c17800156a2b91e5d57525127a4639df036bf38b..62f9a8858f847226a9fc45fbedc25ee04294abd5 100644 (file)
--- 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,6 +69,7 @@ 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
@@ -115,23 +117,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 +137,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
@@ -326,7 +319,7 @@ 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"
@@ -336,7 +329,10 @@ node[:tile][:styles].each do |name, details|
   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]
@@ -497,32 +493,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"