X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ff044920428608b2c04507ad52d6ab52c9d6555f..f4d9298947b4e2f3740236d9fe51aec7e63ce31e:/cookbooks/tile/recipes/default.rb diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index 767b4d3e1..675f8e7df 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -235,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}" @@ -351,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" @@ -366,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" @@ -513,7 +503,7 @@ template "/usr/local/bin/cleanup-tiles" do mode 0755 end -tile_directories = node[:tile][:styles].collect do |_,style| +tile_directories = node[:tile][:styles].collect do |_, style| style[:tile_directories].collect { |directory| directory[:name] } end.flatten.sort.uniq