Fix permissions

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 190aed4a16b5be0c718afacc7dc9d790e9277271..3ad897448ca803c7568446fd408d058037564108 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -66,16 +66,10 @@ service "renderd" do
   supports :status => false, :restart => true, :reload => false
 end
 
   supports :status => false, :restart => true, :reload => false
 end
 

-directory node[:tile][:tile_directory] do
+directory "/srv/tile.openstreetmap.org/tiles" do

   owner "tile"
   owner "tile"

-  group "www-data"
-  mode 0775
-end
-
-if node[:tile][:tile_directory] != "/srv/tile.openstreetmap.org/tiles"
-  link "/srv/tile.openstreetmap.org/tiles" do
-    to node[:tile][:tile_directory]
-  end
+  group "tile"
+  mode 0755

 end
 
 template "/etc/renderd.conf" do
 end
 
 template "/etc/renderd.conf" do


@@ -97,6 +91,13 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   files_mode 0644
 end
 
   files_mode 0644
 end
 

+template "/srv/tile.openstreetmap.org/html/index.html" do
+  source "index.html.erb"
+  owner "tile"
+  group "tile"
+  mode 0644
+end
+

 package "python-cairo"
 package "python-mapnik"
 
 package "python-cairo"
 package "python-mapnik"
 


@@ -114,6 +115,20 @@ template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   variables :blocks => blocks
 end
 
   variables :blocks => blocks
 end
 

+template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
+  source "debug.erb"
+  owner "tile"
+  group "tile"
+  mode 0755
+end
+
+template "/etc/cron.hourly/export" do
+  source "export.cron.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+

 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"


@@ -175,6 +190,14 @@ node[:tile][:data].each do |name,data|
     end
   end
 
     end
   end
 

+  execute "#{file}_shapeindex" do
+    action :nothing
+    command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
+    user "tile"
+    user "tile"
+    subscribes :run, resources(:execute => file), :immediately
+  end
+

   remote_file file do
     action :create_if_missing 
     source url
   remote_file file do
     action :create_if_missing 
     source url


@@ -222,8 +245,24 @@ node[:tile][:styles].each do |name,details|
 
   directory tile_directory do
     owner "tile"
 
   directory tile_directory do
     owner "tile"

-    group "www-data"
-    mode 0775
+    group "tile"
+    mode 0755
+  end
+
+  details[:tile_directories].each do |directory|
+    directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
+      directory  "#{directory[:name]}/#{zoom}" do
+        owner "www-data"
+        group "www-data"
+        mode 0755
+      end
+
+      link "#{tile_directory}/#{zoom}" do
+        to "#{directory[:name]}/#{zoom}"
+        owner "tile"
+        group "tile"
+      end
+    end

   end
 
   file "#{tile_directory}/planet-import-complete" do
   end
 
   file "#{tile_directory}/planet-import-complete" do


@@ -254,7 +293,7 @@ node[:tile][:styles].each do |name,details|
     user "tile"
     group "tile"
     subscribes :run, "git[#{style_directory}]"
     user "tile"
     group "tile"
     subscribes :run, "git[#{style_directory}]"

-    notifies :restart, "service[renderd]"
+    notifies :restart, "service[renderd]", :immediately

     notifies :restart, "service[update-lowzoom-#{name}]"
   end
 end
     notifies :restart, "service[update-lowzoom-#{name}]"
   end
 end


@@ -322,12 +361,10 @@ postgresql_munin "gis" do
   database "gis"
 end
 
   database "gis"
 end
 

-#if node[:tile][:node_file]
-#  file node[:tile][:node_file] do
-#    owner "tile"
-#    group "tile"
-#    mode 0664
-#  end
+#file node[:tile][:node_file] do
+#  owner "tile"
+#  group "www-data"
+#  mode 0640

 #end
 
 directory "/var/log/tile" do
 #end
 
 directory "/var/log/tile" do


@@ -344,11 +381,10 @@ package "rubygems"
 
 package "libproj-dev"
 package "libxml2-dev"
 
 package "libproj-dev"
 package "libxml2-dev"

-package "libpq-dev"

 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"

-gem_package "pg"
+gem_package "mmap"

 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"
 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"


@@ -426,7 +462,7 @@ template "/etc/cron.d/render-lowzoom" do
   source "render-lowzoom.cron.erb"
   owner "root"
   group "root"
   source "render-lowzoom.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0644

 end
 
 template "/etc/rsyslog.d/20-renderd.conf" do
 end
 
 template "/etc/rsyslog.d/20-renderd.conf" do


@@ -437,9 +473,31 @@ template "/etc/rsyslog.d/20-renderd.conf" do
   notifies :restart, "service[rsyslog]"
 end
 
   notifies :restart, "service[rsyslog]"
 end
 

+package "libfilesys-df-perl"
+
+template "/usr/local/bin/cleanup-tiles" do
+  source "cleanup-tiles.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+tile_directories = node[:tile][:styles].collect do |name,style|
+  style[:tile_directories].collect { |directory| directory[:name] }
+end.flatten.sort.uniq
+
+template "/etc/cron.d/cleanup-tiles" do
+  source "cleanup-tiles.cron.erb"
+  owner "root"
+  group "root"
+  mode 0644
+  variables :directories => tile_directories
+end
+

 munin_plugin "mod_tile_fresh"
 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"
 munin_plugin "mod_tile_fresh"
 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"

+munin_plugin "mod_tile_latency"

 
 munin_plugin "renderd_processed"
 munin_plugin "renderd_queue"
 
 munin_plugin "renderd_processed"
 munin_plugin "renderd_queue"