X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ee7f44802058c129e156835b9bc2934dbbcf2183..4bb5cdcc5d392db7cbe59e71d2b448f1f146a434:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 824b6cf58..03c850dc9 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -257,8 +257,14 @@ node[:tile][:styles].each do |name,details|
   end
 
   details[:tile_directories].each do |directory|
+    directory "#{directory[:name]}" do
+      owner "www-data"
+      group "www-data"
+      mode 0755
+    end
+
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
-      directory  "#{directory[:name]}/#{zoom}" do
+      directory "#{directory[:name]}/#{zoom}" do
         owner "www-data"
         group "www-data"
         mode 0755
@@ -368,11 +374,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"
@@ -480,6 +494,7 @@ template "/etc/rsyslog.d/20-renderd.conf" do
   notifies :restart, "service[rsyslog]"
 end
 
+package "liblockfile-simple-perl"
 package "libfilesys-df-perl"
 
 template "/usr/local/bin/cleanup-tiles" do