Fix some foodcritic complaints

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 4711428a20343525b703bd2b1c01fb9ba74915dd..19c99b0ce9482752f154cb950dfc726a00af1709 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,13 +17,19 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+require "ipaddr"
+

 certificate = node[:tilecache][:ssl][:certificate]
 certificate = node[:tilecache][:ssl][:certificate]

-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ]
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate]

 
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 
 
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 

+package "apache2" do
+  action :remove
+end
+

 package "xz-utils"
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 package "xz-utils"
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }


@@ -74,12 +80,16 @@ template "/etc/logrotate.d/squid" do
 end
 
 nginx_site "default" do
 end
 
 nginx_site "default" do

-  action [ :delete ]
+  action [:delete]
+end
+
+resolvers = node[:networking][:nameservers].map do |resolver|
+  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver

 end
 
 nginx_site "tile-ssl" do
   template "nginx_tile_ssl.conf.erb"
 end
 
 nginx_site "tile-ssl" do
   template "nginx_tile_ssl.conf.erb"

-  variables :certificate => certificate
+  variables :certificate => certificate, :resolvers => resolvers

 end
 
 service "nginx-certificate-restart" do
 end
 
 service "nginx-certificate-restart" do