Update to osm-carto v5.6.0

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 4de4200bcdd425192f7677e6469a09edb2fea0ea..36c3185696e5a29e87b69abae578981e0d897999 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -165,30 +165,6 @@ python_package "pyotp" do
   python_version "3"
 end
 
   python_version "3"
 end
 

-unifont = if node[:lsb][:release].to_f < 22.04
-            "ttf-unifont"
-          else
-            "fonts-unifont"
-          end
-
-package %W[
-  fonts-noto-cjk
-  fonts-noto-hinted
-  fonts-noto-unhinted
-  fonts-hanazono
-  #{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 "644"
-  end
-end
-

 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"


@@ -386,6 +362,21 @@ node[:tile][:styles].each do |name, details|
     group "tile"
   end
 
     group "tile"
   end
 

+  link "#{style_directory}/fonts" do
+    to "/srv/tile.openstreetmap.org/fonts"
+    owner "tile"
+    group "tile"
+  end
+
+  execute "#{style_directory}/fonts" do
+    action :nothing
+    command "scripts/get-fonts.sh"
+    cwd style_directory
+    user "tile"
+    group "tile"
+    subscribes :run, "git[#{style_directory}]"
+  end
+

   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.0 project.mml > project.xml"
   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.0 project.mml > project.xml"

diff --git a/roles/tile.rb b/roles/tile.rb
index ea8b27daf1fbfb913673792625acbe4969ce5ab8..c188be8d58d1a432f94fdc51d6ff27df4bd09e5f 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -104,7 +104,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v5.5.1",
+        :revision => "v5.6.0",

         :max_zoom => 19
       }
     }
         :max_zoom => 19
       }
     }