Revert "Explcitly disable IPv6 on the IC internal network"

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 13ad6418d9cc584f01a0fd8154be1f4c799ba377..89489f5bd49c6b2fe4acc45eb955c7bc26eb4357 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -21,10 +21,12 @@ 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")
 
 apache_module "alias"
 
 blocks = data_bag_item("tile", "blocks")
 
 apache_module "alias"

+apache_module "cgi"

 apache_module "expires"
 apache_module "headers"
 apache_module "remoteip"
 apache_module "expires"
 apache_module "headers"
 apache_module "remoteip"


@@ -34,10 +36,10 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
   conf "tile.conf.erb"
 end
 

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

 
 apache_site "default" do
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 apache_site "tile.openstreetmap.org" do
 end
 
 apache_site "tile.openstreetmap.org" do


@@ -61,20 +63,14 @@ end
 package "renderd"
 
 service "renderd" do
 package "renderd"
 
 service "renderd" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   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


@@ -82,8 +78,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


@@ -96,6 +92,26 @@ 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 "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"
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"


@@ -110,13 +126,29 @@ 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"
   mode 0755
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"
   mode 0755
 end
 

-node[:tile][:data].each do |name,data|
+package "mapnik-utils"
+
+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]}"
   url = data[:url]
   file = "/srv/tile.openstreetmap.org/data/#{File.basename(url)}"
   directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}"


@@ -150,35 +182,36 @@ 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
   end
 
       user "tile"
       group "tile"
     end
   end
 

-  if data[:processed]
-    original = "#{directory}/#{data[:original]}"
-    processed = "#{directory}/#{data[:processed]}"
-
-    package "gdal-bin"
-
-    execute processed do
-      action :nothing
-      command "ogr2ogr #{processed} #{original}"
-      user "tile"
-      group "tile"
-      subscribes :run, resources(:execute => file), :immediately
-    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
   end
 
   remote_file file do

-    action :create_if_missing 
+    if data[:refresh]
+      action :create
+      use_conditional_get true
+      ignore_failure 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
 


@@ -191,10 +224,59 @@ directory "/srv/tile.openstreetmap.org/styles" do
   mode 0755
 end
 
   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}"
 
   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 "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
     action :create_if_missing
     owner "tile"
   file "#{tile_directory}/planet-import-complete" do
     action :create_if_missing
     owner "tile"


@@ -217,16 +299,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
 


@@ -260,13 +340,7 @@ postgresql_extension "postgis" do
   database "gis"
 end
 
   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"
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"


@@ -275,11 +349,7 @@ end
   end
 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"
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"


@@ -293,27 +363,33 @@ 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"
+  group "tile"
+  mode 0755
+end

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

-package "rubygems"
+package "ruby-dev"
+
+if node[:lsb][:release].to_f < 14.04
+  package "rubygems"
+end

 
 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"

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


@@ -332,13 +408,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


@@ -366,10 +443,10 @@ template "/etc/init.d/replicate" do
 end
 
 service "replicate" do
 end
 
 service "replicate" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :restart => true
   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


@@ -379,16 +456,68 @@ 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 0644
+end
+
+template "/etc/rsyslog.d/20-renderd.conf" do
+  source "renderd.rsyslog.erb"
+  owner "root"
+  group "root"
+  mode 0644
+  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_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 "replication_delay" do
   conf "munin.erb"
 end
 munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay" do
   conf "munin.erb"
 end

-