Fix typo

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index bf5431d068d3269e2d1b3b14a4aa5f9f588addc2..024075ef030208841637eb93984fa0131e793393 100644 (file)
--- 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
 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
 end
 
 apache_site "tile.openstreetmap.org" do


@@ -62,7 +62,7 @@ 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
 


@@ -213,7 +213,7 @@ node[:tile][:data].each_value do |data|
       action :create
       use_conditional_get true
     else
       action :create
       use_conditional_get true
     else

-      action :create_if_missing 
+      action :create_if_missing

     end
 
     source url
     end
 
     source url


@@ -235,7 +235,7 @@ 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}"
 


@@ -351,13 +351,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"


@@ -366,11 +360,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"


@@ -461,7 +451,7 @@ template "/etc/init.d/replicate" do
 end
 
 service "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]"
   supports :restart => true
   subscribes :restart, "template[/usr/local/bin/replicate]"
   subscribes :restart, "template[/etc/init.d/replicate]"


@@ -513,7 +503,7 @@ template "/usr/local/bin/cleanup-tiles" do
   mode 0755
 end
 
   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
 
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq