From: Tom Hughes <tom@compton.nu>
Date: Sat, 6 Aug 2022 14:47:39 +0000 (+0100)
Subject: Avoid hard coding the font fetcher script details
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/2f01e7763cd3be3939bde1c623ebcc3ee17cf27e?hp=8fc909af185e93f6014d3edc9fe01be643c239c1

Avoid hard coding the font fetcher script details
---

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 36c318569..70085058d 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -362,19 +362,15 @@ node[:tile][:styles].each do |name, details|
     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}]"
+  if details[:fonts_script]
+    execute details[:fonts_script] do
+      action :nothing
+      command details[:fonts_script]
+      cwd style_directory
+      user "tile"
+      group "tile"
+      subscribes :run, "git[#{style_directory}]"
+    end
   end
 
   execute "#{style_directory}/project.mml" do
diff --git a/roles/tile.rb b/roles/tile.rb
index c188be8d5..25407d75b 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -105,6 +105,7 @@ default_attributes(
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
         :revision => "v5.6.0",
+        :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh",
         :max_zoom => 19
       }
     }