Modernise more LWRPs

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 0a02e1567edfac8c19ce52df47e44b55b724685d..a69b6ed8dda6e6d0966ed7cd9a4156e935fc2996 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -27,8 +27,10 @@ package "apache2" do
   action :remove
 end
 
   action :remove
 end
 

-package "xz-utils"
-package "openssl"
+package %w[
+  xz-utils
+  openssl
+]

 
 # oathtool for QoS token
 package "oathtool"
 
 # oathtool for QoS token
 package "oathtool"


@@ -120,7 +122,7 @@ ssl_certificate "tile.openstreetmap.org" do
 end
 
 nginx_site "tile-ssl" do
 end
 
 nginx_site "tile-ssl" do

-  template "nginx_tile_ssl.conf.erb"
+  template_source "nginx_tile_ssl.conf.erb"

   variables :resolvers => resolvers, :caches => tilecaches
 end
 
   variables :resolvers => resolvers, :caches => tilecaches
 end