Remove setting of level0.overpass_url_prefix, default should be fine.

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 4711428a20343525b703bd2b1c01fb9ba74915dd..625783b666d9ef9c524069b2aacb4226643405dd 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,14 +17,21 @@
 # limitations under the License.
 #
 
+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"
+package "openssl"
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 tilerenders = search(:node, "roles:tile").sort_by { |n| n[:hostname] }
@@ -70,16 +77,20 @@ template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 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"
-  variables :certificate => certificate
+  variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches
 end
 
 service "nginx-certificate-restart" do
@@ -90,6 +101,13 @@ service "nginx-certificate-restart" do
   subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
 end
 
+template "/etc/logrotate.d/nginx" do
+  source "logrotate.nginx.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
 tilerenders.each do |render|
   munin_plugin "ping_#{render[:fqdn]}" do
     target "ping_"