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 8af830cddd73909ffd3d16e90c33ee6f90530533..6b3e7b9c98f57b9955da8c5c8d59c712976ec15e 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -31,8 +31,6 @@ apache_module "headers"
 apache_module "remoteip"
 apache_module "rewrite"
 
 apache_module "remoteip"
 apache_module "rewrite"
 

-package "libapache2-mod-tile"
-

 apache_module "tile" do
   conf "tile.conf.erb"
 end
 apache_module "tile" do
   conf "tile.conf.erb"
 end


@@ -68,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


@@ -85,8 +77,8 @@ template "/etc/renderd.conf" do
   owner "root"
   group "root"
   mode 0644
   owner "root"
   group "root"
   mode 0644

-  notifies :reload, resources(:service => "apache2")
-  notifies :restart, resources(:service => "renderd")
+  notifies :reload, "service[apache2]"
+  notifies :restart, "service[renderd]"

 end
 
 remote_directory "/srv/tile.openstreetmap.org/html" do
 end
 
 remote_directory "/srv/tile.openstreetmap.org/html" do


@@ -99,8 +91,17 @@ 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"

+package "ttf-dejavu"
+package "ttf-unifont"

 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"


@@ -116,6 +117,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"


@@ -156,7 +171,7 @@ node[:tile][:data].each do |name,data|
 
     execute file do
       action :nothing
 
     execute file do
       action :nothing

-      command "unzip -qq #{file} -d #{directory}"
+      command "unzip -qq -o #{file} -d #{directory}"

       user "tile"
       group "tile"
     end
       user "tile"
       group "tile"
     end


@@ -173,18 +188,33 @@ node[:tile][:data].each do |name,data|
       command "ogr2ogr #{processed} #{original}"
       user "tile"
       group "tile"
       command "ogr2ogr #{processed} #{original}"
       user "tile"
       group "tile"

-      subscribes :run, resources(:execute => file), :immediately
+      subscribes :run, "execute[#{file}]", :immediately

     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"
+    group "tile"
+    subscribes :run, "execute[#{file}]", :immediately
+  end
+

   remote_file file do
   remote_file file do

-    action :create_if_missing 
+    if data[:refresh]
+      action :create
+      use_conditional_get true
+    else
+      action :create_if_missing 
+    end
+

     source url
     owner "tile"
     group "tile"
     mode 0644
     source url
     owner "tile"
     group "tile"
     mode 0644

-    notifies :run, resources(:execute => file), :immediately
-    notifies :restart, resources(:service => "renderd")
+    backup false
+    notifies :run, "execute[#{file}]", :immediately
+    notifies :restart, "service[renderd]"

   end
 end
 
   end
 end
 


@@ -224,8 +254,30 @@ 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 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
+        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


@@ -310,8 +362,7 @@ end
   "planet_osm_line", 
   "planet_osm_point", 
   "planet_osm_polygon", 
   "planet_osm_line", 
   "planet_osm_point", 
   "planet_osm_polygon", 

-  "planet_osm_roads",
-  "planet_osm_nodes" ].each do |table|
+  "planet_osm_roads" ].each do |table|

   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"


@@ -325,13 +376,11 @@ 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
-#end
+file node[:tile][:node_file] do
+  owner "tile"
+  group "www-data"
+  mode 0640
+end

 
 directory "/var/log/tile" do
   owner "tile"
 
 directory "/var/log/tile" do
   owner "tile"


@@ -347,11 +396,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"


@@ -407,8 +455,8 @@ end
 service "replicate" do
   action [ :enable, :start ]
   supports :restart => true
 service "replicate" do
   action [ :enable, :start ]
   supports :restart => true

-  subscribes :restart, resources(:template => "/usr/local/bin/replicate")
-  subscribes :restart, resources(:template => "/etc/init.d/replicate")
+  subscribes :restart, "template[/usr/local/bin/replicate]"
+  subscribes :restart, "template[/etc/init.d/replicate]"

 end
 
 template "/etc/logrotate.d/replicate" do
 end
 
 template "/etc/logrotate.d/replicate" do


@@ -429,7 +477,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


@@ -440,12 +488,36 @@ template "/etc/rsyslog.d/20-renderd.conf" do
   notifies :restart, "service[rsyslog]"
 end
 
   notifies :restart, "service[rsyslog]"
 end
 

+package "liblockfile-simple-perl"
+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_fresh"

+munin_plugin "mod_tile_latency"

 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"
 
 munin_plugin "renderd_processed"
 munin_plugin "renderd_queue"
 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"
 
 munin_plugin "renderd_processed"
 munin_plugin "renderd_queue"

+munin_plugin "renderd_queue_time"

 munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"
 
 munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"