X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3db44fd1698b5de08358c5d94ddde7271f4b3333..e83395675fe4f9b35a1d83e99c50d1ea6fbe79fd:/cookbooks/tile/recipes/default.rb diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index bb7459ece..024075ef0 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -38,7 +38,7 @@ end tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] } apache_site "default" do - action [ :disable ] + action [:disable] end apache_site "tile.openstreetmap.org" do @@ -62,20 +62,14 @@ end package "renderd" service "renderd" do - action [ :enable, :start ] + action [:enable, :start] supports :status => false, :restart => true, :reload => false end -directory node[:tile][:tile_directory] do +directory "/srv/tile.openstreetmap.org/tiles" do 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 @@ -83,8 +77,8 @@ template "/etc/renderd.conf" do 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 @@ -97,9 +91,26 @@ remote_directory "/srv/tile.openstreetmap.org/html" do 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 "ttf-dejavu" +package "fonts-droid" +package "ttf-unifont" +package "fonts-sipa-arundina" +package "fonts-sil-padauk" +package "fonts-khmeros" +package "ttf-indic-fonts-core" +package "ttf-tamil-fonts" +package "ttf-kannada-fonts" + directory "/srv/tile.openstreetmap.org/cgi-bin" do owner "tile" group "tile" @@ -114,13 +125,27 @@ template "/srv/tile.openstreetmap.org/cgi-bin/export" do 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" mode 0755 end -node[:tile][:data].each do |name,data| +node[:tile][:data].each_value do |data| url = data[:url] file = "/srv/tile.openstreetmap.org/data/#{File.basename(url)}" directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}" @@ -154,7 +179,7 @@ node[:tile][:data].each do |name,data| execute file do action :nothing - command "unzip -qq #{file} -d #{directory}" + command "unzip -qq -o #{file} -d #{directory}" user "tile" group "tile" end @@ -171,18 +196,33 @@ node[:tile][:data].each do |name,data| command "ogr2ogr #{processed} #{original}" user "tile" group "tile" - subscribes :run, resources(:execute => file), :immediately + subscribes :run, "execute[#{file}]", :immediately 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 - 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 - notifies :run, resources(:execute => file), :immediately - notifies :restart, resources(:service => "renderd") + backup false + notifies :run, "execute[#{file}]", :immediately + notifies :restart, "service[renderd]" end end @@ -195,7 +235,7 @@ directory "/srv/tile.openstreetmap.org/styles" do mode 0755 end -node[:tile][:styles].each do |name,details| +node[:tile][:styles].each do |name, details| style_directory = "/srv/tile.openstreetmap.org/styles/#{name}" tile_directory = "/srv/tile.openstreetmap.org/tiles/#{name}" @@ -222,8 +262,30 @@ node[:tile][:styles].each do |name,details| 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 @@ -254,7 +316,7 @@ node[:tile][:styles].each do |name,details| 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 @@ -289,13 +351,7 @@ postgresql_extension "postgis" do database "gis" end -[ "geography_columns", - "planet_osm_nodes", - "planet_osm_rels", - "planet_osm_ways", - "raster_columns", - "raster_overviews", - "spatial_ref_sys" ].each do |table| +%w(geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys).each do |table| postgresql_table table do cluster node[:tile][:database][:cluster] database "gis" @@ -304,11 +360,7 @@ end end end -[ "geometry_columns", - "planet_osm_line", - "planet_osm_point", - "planet_osm_polygon", - "planet_osm_roads" ].each do |table| +%w(geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads).each do |table| postgresql_table table do cluster node[:tile][:database][:cluster] database "gis" @@ -322,13 +374,11 @@ postgresql_munin "gis" do 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" @@ -344,11 +394,10 @@ package "rubygems" package "libproj-dev" package "libxml2-dev" -package "libpq-dev" gem_package "proj4rb" gem_package "libxml-ruby" -gem_package "pg" +gem_package "mmap" remote_directory "/usr/local/lib/site_ruby" do source "ruby" @@ -367,6 +416,13 @@ template "/usr/local/bin/expire-tiles" do mode 0755 end +template "/etc/sudoers.d/tile" do + source "sudoers.erb" + owner "root" + group "root" + mode 0440 +end + directory "/var/lib/replicate" do owner "tile" group "tile" @@ -395,10 +451,10 @@ template "/etc/init.d/replicate" do end service "replicate" do - action [ :enable, :start ] + 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 @@ -419,7 +475,7 @@ template "/etc/cron.d/render-lowzoom" do source "render-lowzoom.cron.erb" owner "root" group "root" - mode 0755 + mode 0644 end template "/etc/rsyslog.d/20-renderd.conf" do @@ -430,12 +486,43 @@ template "/etc/rsyslog.d/20-renderd.conf" do notifies :restart, "service[rsyslog]" end +template "/etc/logrotate.d/renderd" do + source "renderd.logrotate.erb" + owner "root" + group "root" + mode 0644 +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 |_, 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_latency" 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"