Avoid hard coding the font fetcher script details

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 36c3185696e5a29e87b69abae578981e0d897999..70085058d71288c82acdc0dbb2384fe9f41dc406 100644 (file)
--- 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 c188be8d58d1a432f94fdc51d6ff27df4bd09e5f..25407d75b52982409e83ba83005cb6c1a2a4e845 100644 (file)
--- 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
       }
     }