X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/926b39e016afc77a6b8ea32c37273c7a6fca5467..21958591555b0b80370e944e3128ac5d533c281d:/cookbooks/tilecache/recipes/default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 37d10295f..ce4819ad0 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -20,12 +20,16 @@
 require "ipaddr"
 
 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"
 
+package "apache2" do
+  action :remove
+end
+
 package "xz-utils"
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
@@ -76,7 +80,7 @@ template "/etc/logrotate.d/squid" do
 end
 
 nginx_site "default" do
-  action [ :delete ]
+  action [:delete]
 end
 
 resolvers = node[:networking][:nameservers].map do |resolver|