Upgrade ridley and ouroboros to chef 12

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index fc4feb0b63fe19eeefffb68fbb6d5685f9d5b588..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
 


@@ -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]"