X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..e83395675fe4f9b35a1d83e99c50d1ea6fbe79fd:/cookbooks/tile/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index fc4feb0b6..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,7 +62,7 @@ end package "renderd" service "renderd" do - action [ :enable, :start ] + action [:enable, :start] supports :status => false, :restart => true, :reload => false end @@ -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" @@ -461,7 +451,7 @@ template "/etc/init.d/replicate" do end service "replicate" do - action [ :enable, :start ] + action [:enable, :start] supports :restart => true subscribes :restart, "template[/usr/local/bin/replicate]" subscribes :restart, "template[/etc/init.d/replicate]"