Remove apache2 if installed on tilecaches

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 4711428a20343525b703bd2b1c01fb9ba74915dd..1aad4b9ff4652b3ba20b9d364d52bc59b82967ec 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+require "ipaddr"
+
 certificate = node[:tilecache][:ssl][:certificate]
 node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ]
 
@@ -24,6 +26,10 @@ 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] }
@@ -77,9 +83,13 @@ nginx_site "default" do
   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"
-  variables :certificate => certificate
+  variables :certificate => certificate, :resolvers => resolvers
 end
 
 service "nginx-certificate-restart" do