tilecache: Unblock Mozilla/5.0. Report that used by QLandkarte. Allow time to fix

[chef.git] / cookbooks / tile / recipes / default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 9f54d530dbec066d8f3e27af17986e4d0e617f24..6b3e7b9c98f57b9955da8c5c8d59c712976ec15e 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -100,6 +100,8 @@ end
 
 package "python-cairo"
 package "python-mapnik"
+package "ttf-dejavu"
+package "ttf-unifont"
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
@@ -257,7 +259,7 @@ node[:tile][:styles].each do |name,details|
   end
 
   details[:tile_directories].each do |directory|
-    directory "#{directory[:name]}" do
+    directory directory[:name] do
       owner "www-data"
       group "www-data"
       mode 0755
@@ -374,18 +376,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