X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/64fa4422a41b8e8095656c3776ed1368094cb54a..2c854e9952890a119750a187479eb2701107705f:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index bb79e32bd..d2f875611 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -194,7 +194,7 @@ node[:tile][:data].each do |name,data|
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
     user "tile"
-    user "tile"
+    group "tile"
     subscribes :run, resources(:execute => file), :immediately
   end
 
@@ -368,11 +368,19 @@ postgresql_munin "gis" do
   database "gis"
 end
 
-#file node[:tile][:node_file] do
-#  owner "tile"
-#  group "www-data"
-#  mode 0640
-#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
+end
 
 directory "/var/log/tile" do
   owner "tile"