X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ba874accf389eb9ea33db83df767af84b2f251d1..c7535f4ff41a489ff27b56e08abd620dfda0eb0e:/cookbooks/tile/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index e494d630d..6cb1b9acb 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -100,8 +100,16 @@ end package "python-cairo" package "python-mapnik" + package "ttf-dejavu" +package "fonts-droid" package "ttf-unifont" +package "fonts-sipa-arundina" +package "fonts-sil-padauk" +package "fonts-khmeros" +package "ttf-indic-fonts-core" +package "ttf-tamil-fonts" +package "ttf-kannada-fonts" directory "/srv/tile.openstreetmap.org/cgi-bin" do owner "tile" @@ -376,18 +384,10 @@ postgresql_munin "gis" do database "gis" end -tile_uid = node[:etc][:passwd][:"tile"][:uid] -www_data_gid = node[:etc][:group][:"www-data"][:gid] - -ruby_block node[:tile][:node_file] do - block do - File.chown(tile_uid, www_data_gid, node[:tile][:node_file]) - File.chmod(0640, node[:tile][:node_file]) - end - not_if do - stat = File.stat(node[:tile][:node_file]) - stat.uid == tile_uid && stat.gid == www_data_gid && stat.mode == 0640 - end +file node[:tile][:node_file] do + owner "tile" + group "www-data" + mode 0640 end directory "/var/log/tile" do @@ -496,6 +496,13 @@ template "/etc/rsyslog.d/20-renderd.conf" do notifies :restart, "service[rsyslog]" end +template "/etc/logrotate.d/renderd" do + source "renderd.logrotate.erb" + owner "root" + group "root" + mode 0644 +end + package "liblockfile-simple-perl" package "libfilesys-df-perl"