Support IPv6 resolvers in nginx config

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

+require "ipaddr"
+

 certificate = node[:tilecache][:ssl][:certificate]
 node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ]
 
 certificate = node[:tilecache][:ssl][:certificate]
 node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ]
 


@@ -77,9 +79,13 @@ nginx_site "default" do
   action [ :delete ]
 end
 
   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"
 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

diff --git a/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
index 7ada68069709de077427824161d4103c9fd7af50..60059837b6cf56f5efd923fb6d8a955ee107cfc7 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
@@ -13,8 +13,7 @@ server {
     ssl_session_cache shared:SSL:30m;
     ssl_session_timeout 15m;
     ssl_stapling on;
     ssl_session_cache shared:SSL:30m;
     ssl_session_timeout 15m;
     ssl_stapling on;

-    resolver <%= node[:networking][:nameservers].join(" ") %>;
+    resolver <%= @resolvers.join(" ") %>;

 
     location / { proxy_pass http://127.0.0.1; proxy_set_header X-Forwarded-For $remote_addr; }
 
     location / { proxy_pass http://127.0.0.1; proxy_set_header X-Forwarded-For $remote_addr; }

-

 }
 }