Use https between tile caches and render servers

[chef.git] / cookbooks / imagery / resources / site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 155a43f42cdadc3a56fc2a996fdb36daf34a9b2c..aa5d8ebf20832f641369c24a0bcc7d581a82606d 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -47,12 +47,12 @@ action :create do
     recursive true
   end
 
     recursive true
   end
 

-  template "/srv/#{new_resource.site}/index.html" do
+  declare_resource :template, "/srv/#{new_resource.site}/index.html" do

     source "index.html.erb"
     user "root"
     group "root"
     mode 0o644
     source "index.html.erb"
     user "root"
     group "root"
     mode 0o644

-    variables :title => title
+    variables :title => new_resource.title

   end
 
   cookbook_file "/srv/#{new_resource.site}/imagery.css" do
   end
 
   cookbook_file "/srv/#{new_resource.site}/imagery.css" do


@@ -80,7 +80,7 @@ action :create do
     YAML.safe_load(::File.read(path), [Symbol])
   end
 
     YAML.safe_load(::File.read(path), [Symbol])
   end
 

-  template "/srv/#{new_resource.site}/imagery.js" do
+  declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do

     source "imagery.js.erb"
     user "root"
     group "root"
     source "imagery.js.erb"
     user "root"
     group "root"


@@ -95,15 +95,11 @@ action :create do
     domains tile_domains
   end
 
     domains tile_domains
   end
 

-  resolvers = node[:networking][:nameservers].map do |resolver|
-    IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-  end
-

   nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{new_resource.site}"
     restart_nginx false
   nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{new_resource.site}"
     restart_nginx false

-    variables new_resource.to_hash.merge(:resolvers => resolvers)
+    variables new_resource.to_hash

   end
 end
 
   end
 end