Set correct ISP role for spike-0[45] and thorn-0[45]

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 37d10295fdbbe57cfc857caf90a78f51f4165193..1f02661b7e912a1b564c8ed37338d06465703f07 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -20,13 +20,18 @@
 require "ipaddr"
 
 certificate = node[:tilecache][:ssl][:certificate]
 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"
 
 
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 

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

 package "xz-utils"
 package "xz-utils"

+package "openssl"

 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 tilerenders = search(:node, "roles:tile").sort_by { |n| n[:hostname] }
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 tilerenders = search(:node, "roles:tile").sort_by { |n| n[:hostname] }


@@ -76,16 +81,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|
 end
 
 resolvers = node[:networking][:nameservers].map do |resolver|

-  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : "#{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, :resolvers => resolvers
+  variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches

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