X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..5c94f159156a569dc9fff3444cc60700911afe83:/cookbooks/tile/recipes/default.rb diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index 4de4200bc..70085058d 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -165,30 +165,6 @@ python_package "pyotp" do 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" @@ -386,6 +362,17 @@ node[:tile][:styles].each do |name, details| group "tile" end + 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 action :nothing command "carto -a 3.0.0 project.mml > project.xml"