Add mod_tile_latency

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 13ad6418d9cc584f01a0fd8154be1f4c799ba377..c1cf075b5e8f9e6ba534d5b50b4f14554bb2709e 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -21,6 +21,7 @@ include_recipe "apache"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"

+include_recipe "tools"

 
 blocks = data_bag_item("tile", "blocks")
 
 
 blocks = data_bag_item("tile", "blocks")
 


@@ -30,11 +31,13 @@ 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
 

-tilecaches = search(:node, "roles:tilecache")
+tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }

 
 apache_site "default" do
   action [ :disable ]
 
 apache_site "default" do
   action [ :disable ]


@@ -96,6 +99,9 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   files_mode 0644
 end
 
   files_mode 0644
 end
 

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

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


@@ -171,6 +177,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


@@ -195,6 +209,33 @@ node[:tile][:styles].each do |name,details|
   style_directory = "/srv/tile.openstreetmap.org/styles/#{name}"
   tile_directory = "/srv/tile.openstreetmap.org/tiles/#{name}"
 
   style_directory = "/srv/tile.openstreetmap.org/styles/#{name}"
   tile_directory = "/srv/tile.openstreetmap.org/tiles/#{name}"
 

+  template "/usr/local/bin/update-lowzoom-#{name}" do
+    source "update-lowzoom.erb"
+    owner "root"
+    group "root"
+    mode 0755
+    variables :style => name
+  end
+
+  template "/etc/init.d/update-lowzoom-#{name}" do
+    source "update-lowzoom.init.erb"
+    owner "root"
+    group "root"
+    mode 0755
+    variables :style => name
+  end
+
+  service "update-lowzoom-#{name}" do
+    action :disable
+    supports :restart => true
+  end
+
+  directory tile_directory do
+    owner "tile"
+    group "www-data"
+    mode 0775
+  end
+

   file "#{tile_directory}/planet-import-complete" do
     action :create_if_missing
     owner "tile"
   file "#{tile_directory}/planet-import-complete" do
     action :create_if_missing
     owner "tile"


@@ -217,16 +258,14 @@ node[:tile][:styles].each do |name,details|
   end
 
   execute "#{style_directory}/project.mml" do
   end
 
   execute "#{style_directory}/project.mml" do

+    action :nothing

     command "carto project.mml > project.xml"
     cwd style_directory
     user "tile"
     group "tile"
     command "carto project.mml > project.xml"
     cwd style_directory
     user "tile"
     group "tile"

-    not_if do
-      File.exist?("#{style_directory}/project.xml") and
-      File.mtime("#{style_directory}/project.xml") >= File.mtime("#{style_directory}/project.mml")
-    end
-    notifies :touch, "file[#{tile_directory}/planet-import-complete]"
-    notifies :restart, "service[renderd]"
+    subscribes :run, "git[#{style_directory}]"
+    notifies :restart, "service[renderd]", :immediately
+    notifies :restart, "service[update-lowzoom-#{name}]"

   end
 end
 
   end
 end
 


@@ -279,7 +318,8 @@ end
   "planet_osm_line", 
   "planet_osm_point", 
   "planet_osm_polygon", 
   "planet_osm_line", 
   "planet_osm_point", 
   "planet_osm_polygon", 

-  "planet_osm_roads" ].each do |table|
+  "planet_osm_roads",
+  "planet_osm_nodes" ].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"


@@ -301,6 +341,12 @@ end
 #  end
 #end
 
 #  end
 #end
 

+directory "/var/log/tile" do
+  owner "tile"
+  group "tile"
+  mode 0755
+end
+

 package "osm2pgsql"
 package "osmosis"
 
 package "osm2pgsql"
 package "osmosis"
 


@@ -332,13 +378,14 @@ template "/usr/local/bin/expire-tiles" do
   mode 0755
 end
 
   mode 0755
 end
 

-directory "/var/lib/replicate" do
-  owner "tile"
-  group "tile"
-  mode 0755
+template "/etc/sudoers.d/tile" do
+  source "sudoers.erb"
+  owner "root"
+  group "root"
+  mode 0440

 end
 
 end
 

-directory "/var/log/replicate" do
+directory "/var/lib/replicate" do

   owner "tile"
   group "tile"
   mode 0755
   owner "tile"
   group "tile"
   mode 0755


@@ -379,9 +426,32 @@ template "/etc/logrotate.d/replicate" do
   mode 0644
 end
 
   mode 0644
 end
 

+template "/usr/local/bin/render-lowzoom" do
+  source "render-lowzoom.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+template "/etc/cron.d/render-lowzoom" do
+  source "render-lowzoom.cron.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+template "/etc/rsyslog.d/20-renderd.conf" do
+  source "renderd.rsyslog.erb"
+  owner "root"
+  group "root"
+  mode 0644
+  notifies :restart, "service[rsyslog]"
+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"


@@ -391,4 +461,3 @@ munin_plugin "renderd_zoom_time"
 munin_plugin "replication_delay" do
   conf "munin.erb"
 end
 munin_plugin "replication_delay" do
   conf "munin.erb"
 end

-